149 files changed, 91571 insertions, 50299 deletions

diff --git a/.gitignore b/.gitignore
index dbd354779..4639c28be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -456,6 +456,7 @@
 /gettext-tools/src/po-gram-gen2.h
 # Files generated by "make", using msgfmt.
 /gettext-runtime/po/??.gmo
+/gettext-runtime/po/ast.gmo
 /gettext-runtime/po/pt_??.gmo
 /gettext-runtime/po/zh_??.gmo
 /gettext-runtime/po/??@*.gmo
diff --git a/gettext-runtime/po/LINGUAS b/gettext-runtime/po/LINGUAS
index 0dc3f9c22..8da22e9a9 100644
--- a/gettext-runtime/po/LINGUAS
+++ b/gettext-runtime/po/LINGUAS
@@ -1,2 +1,2 @@
 # Set of available languages.
-be bg ca cs da de el en@quot en@boldquot eo es et fi fr ga gl hr hu id it ja ko nb nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+ast be bg ca cs da de el en@quot en@boldquot eo es et fi fr ga gl hr hu id it ja ko nb nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-runtime/po/ast.po b/gettext-runtime/po/ast.po
new file mode 100644
index 000000000..cc9cc74c4
--- /dev/null
+++ b/gettext-runtime/po/ast.po
@@ -0,0 +1,391 @@
+# Asturian translation for gettext-runtime
+# Copyright (C) 2018 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+#
+# enolp <enolp@softastur.org>, 2018.
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-07-16 17:18+0100\n"
+"Last-Translator: enolp <enolp@softastur.org>\n"
+"Language-Team: Asturian <ubuntu-l10n-ast@lists.ubuntu.com>\n"
+"Language: ast\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr "fallu d'escritura"
+
+#: gnulib-lib/error.c:195
+msgid "Unknown system error"
+msgstr "Desconozse'l fallu del sistema"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: la opción «%s» ye ambigua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: la opción «%s» ye ambigua, posibilidaes:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nun se reconoz la opción «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: la opción «%c%s» nun permite un argumentu\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: la opción «--%s» rique un argumentu\n"
+
+#: gnulib-lib/getopt.c:621
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opción non válida -- «%c»\n"
+
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: la opción rique un argumentu -- «%c»\n"
+
+#: gnulib-lib/xmalloc.c:38
+#, c-format
+msgid "memory exhausted"
+msgstr "memoria escosada"
+
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Llicencia GPLv3+: GNU GPL versión 3 o más nueva <http://gnu.org/licenses/gpl.html>.\n"
+"Esto ye software llibre: yes llibre de camudalu y redistribuyilu.\n"
+"Nun hai DENGUNA GARANTÍA, na midida permitida pola llei.\n"
+
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escritu por %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/envsubst.c:118
+msgid "Bruno Haible"
+msgstr "Bruno Haible"
+
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
+#, c-format
+msgid "too many arguments"
+msgstr "milenta arugmentos"
+
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
+#, c-format
+msgid "missing arguments"
+msgstr "falten argumentos"
+
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Prueba «%s --help» pa más información.\n"
+
+#: src/envsubst.c:181
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
+msgstr "Usu: %s [OPCIÓN] [FORMATU-SHELL]\n"
+
+#: src/envsubst.c:186
+#, c-format, no-wrap
+msgid "Substitutes the values of environment variables.\n"
+msgstr "Sustitúi los valores de les variables d'entornu.\n"
+
+#: src/envsubst.c:190
+#, c-format, no-wrap
+msgid "Operation mode:\n"
+msgstr "Mou d'operación: \n"
+
+#: src/envsubst.c:193
+#, c-format, no-wrap
+msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
+msgstr "  -v, --variables             amuesa les variables qu'esistan en FORMATU-SHELL\n"
+
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
+#, c-format, no-wrap
+msgid "Informative output:\n"
+msgstr "Salida informativa:\n"
+
+#: src/envsubst.c:200
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  amuesa esta ayuda y cola\n"
+
+#: src/envsubst.c:203
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               amuesa la información de la versión y cola\n"
+
+#: src/envsubst.c:207
+#, c-format, no-wrap
+msgid ""
+"In normal operation mode, standard input is copied to standard output,\n"
+"with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
+"being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
+"only those environment variables that are referenced in SHELL-FORMAT are\n"
+"substituted; otherwise all environment variables references occurring in\n"
+"standard input are substituted.\n"
+msgstr ""
+"Nel mou d'operación normal, la entrada estándar cópiase a la salida\n"
+"estándar, con referencies a les variables d'entornu de la forma $VARIABLEo ${VARIABLE}\n"
+"trocándose colos valores correspondientes. Si s'apurre un FORMATU-SHELL,\n"
+"namái les variables d'entornu que se referenciaren en FORMATU-SHELL van\n"
+"sustituyise, d'otramiente, toles referencies a les variables d'entornu.\n"
+
+#: src/envsubst.c:216
+#, c-format, no-wrap
+msgid ""
+"When --variables is used, standard input is ignored, and the output consists\n"
+"of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
+msgstr ""
+"Cuando s'usa --variables , inórase la entrada estándar y la salida consiste\n"
+"de les variables d'entornu que se referenciaren en FORMATU-SHELL, una per llinia.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Informa de fallos a <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/envsubst.c:448
+#, c-format
+msgid "error while reading \"%s\""
+msgstr "fallu mentanto se lleía «%s»"
+
+#: src/envsubst.c:448
+msgid "standard input"
+msgstr "entrada estandar"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/gettext.c:143 src/ngettext.c:132
+msgid "Ulrich Drepper"
+msgstr "Ulrich Drepper"
+
+#: src/gettext.c:253
+#, c-format, no-wrap
+msgid ""
+"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+"or:    %s [OPTION] -s [MSGID]...\n"
+msgstr ""
+"Usu: %s [OPCIÓN] [[DOMINIU_TESTUAL] MSGID]\n"
+"o:    %s [OPCIÓN] -s [MSGID]...\n"
+
+#: src/gettext.c:259
+#, c-format, no-wrap
+msgid "Display native language translation of a textual message.\n"
+msgstr "Amuesa la traducción en llingua nativa d'un mensaxe testual.\n"
+
+#: src/gettext.c:263
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
+msgid ""
+"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+"                            to MSGID from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  amuesa esta ayuda y cola\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               amuesa la información de la versión y cola\n"
+
+#: src/gettext.c:285
+#, c-format, no-wrap
+msgid ""
+"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+"regular directory, another location can be specified with the environment\n"
+"variable TEXTDOMAINDIR.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
+"But it does not simply copy its arguments to stdout.  Instead those messages\n"
+"found in the selected catalog are translated.\n"
+"Standard search directory: %s\n"
+msgstr ""
+"Si nun s'apurre'l parámetru DOMINIU_TESTUAL, el dominiu determínase de\n"
+"magar la variable d'entornu TEXTDOMAIN. Si nun s'alcuentra'l catálogu de\n"
+"mensaxes nel direutoriu regular, pue especificase otru allugamientu cola\n"
+"variable d'entornu TEXTDOMAINDIR.\n"
+"Cuando s'usa cola opción -s , el programa compórtase como'l comandu «echo».\n"
+"Pero nun copia namái los sos argumentos a stdout, sinón que traduz los\n"
+"mensaxes qu'alcuentre nel catálogu esbilláu.\n"
+"Direutoriu estándar de gueta: %s\n"
+
+#: src/ngettext.c:218
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+msgstr "Usu: %s [OPCIÓN] [DOMINIU_TESTUAL] MSGID MSGID-PLURAL NÚMBERU\n"
+
+#: src/ngettext.c:223
+#, c-format, no-wrap
+msgid ""
+"Display native language translation of a textual message whose grammatical\n"
+"form depends on a number.\n"
+msgstr ""
+"Amuesa la traducción del mensaxe en llingua nativa d'un mensaxe testual\n"
+"que, la so gramática, dependiere d'un númberu.\n"
+
+#: src/ngettext.c:228
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
+msgid ""
+"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
+"  COUNT                     choose singular/plural form based on this value\n"
+msgstr ""
+
+#: src/ngettext.c:251
+#, c-format, no-wrap
+msgid ""
+"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+"regular directory, another location can be specified with the environment\n"
+"variable TEXTDOMAINDIR.\n"
+"Standard search directory: %s\n"
+msgstr ""
+"Si nun s'apurre'l parámetru DOMINIU_TESTUAL, el dominiu determínase de\n"
+"magar la variable d'entornu TEXTDOMAIN. Si nun s'alcuentra'l catálogu de\n"
+"mensaxes nel direutoriu regular, pue especificase otru allugamientu cola\n"
+"variable d'entornu TEXTDOMAINDIR.\n"
+"Direutoriu estándar de gueta: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción «--%s» nun permite un argumentu\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: nun se reconoz la opción «--%s»\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: la opción «-W %s» ye ambigua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción «-W %s» nun permite un argumentu\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: la opción «-W %s» rique un argumentu\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIU_TESTUAL   recupera los mensaxes traducíos de DOMINIU_TESTUAL\n"
+#~ "  -e                        activa la espansión de dalgunes secuencies d'escape\n"
+#~ "  -E                        (inórase por compatibilidá)\n"
+#~ "  -h, --help                amuesa esta ayuda y cola\n"
+#~ "  -n                        desanicia'l saltu de llinia final\n"
+#~ "  -V, --version             amuesa la información de la versión y cola\n"
+#~ "  [DOMINIU_TESTU] MSGID        recupera'l mensaxe traducíu correspondiente\n"
+#~ "                            a MSGID de DOMINIU_TESTUAL\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIU_TESTUAL   recibe'l mensaxe traducíu de DOMINIU_TESTUAL\n"
+#~ "  -e                        activa la espansión de dalgunes secuencies d'escape\n"
+#~ "  -E                        (inórase por compatibilida)\n"
+#~ "  -h, --help                amuesa esta salida y cola\n"
+#~ "  -V, --version             amuesa la información de la versión y cola\n"
+#~ "  [TEXTDOMAIN]              recibe'l mensaxe traducíu de DOMINIU_TESTUAL\n"
+#~ "  MSGID MSGID-PLURAL        traduz el MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     escueye la forma singular/plural según esti valor\n"
diff --git a/gettext-runtime/po/be.po b/gettext-runtime/po/be.po
index 324730caa..9732b308c 100644
--- a/gettext-runtime/po/be.po
+++ b/gettext-runtime/po/be.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
-"POT-Creation-Date: 2002-08-06 16:01+0200\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -13,258 +14,184 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
 
-#: lib/argmatch.c:134
-#, c-format
-msgid "invalid argument `%s' for `%s'"
-msgstr "нерэчаісны аргумэнт `%s' для `%s'"
-
-#: lib/argmatch.c:135
-#, c-format
-msgid "ambiguous argument `%s' for `%s'"
-msgstr "неадназначны аргумэнт `%s' для `%s'"
-
-#: lib/argmatch.c:155
-msgid "Valid arguments are:"
-msgstr "Рэчаісныя аргумэнты:"
-
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267
-#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "памылка ў час чытаньня файла \"%s\""
-
-#: lib/copy-file.c:68
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
-msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
-
-#: lib/copy-file.c:81 src/urlget.c:216
-#, c-format
-msgid "error reading \"%s\""
-msgstr "памылка чытаньня \"%s\""
-
-#: lib/copy-file.c:87 lib/copy-file.c:91
-#, c-format
-msgid "error writing \"%s\""
-msgstr "памылка запісу файла \"%s\""
-
-#: lib/copy-file.c:93 src/urlget.c:226
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "памылка пасля чытаньня \"%s\""
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr ""
 
-#: lib/error.c:116
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
-#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
-#: lib/wait-process.c:132
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s падпрацэс спынены з-за памылкі"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: выбар `%s' неадназначны\n"
 
-#: lib/getopt.c:691
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: lib/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: lib/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: lib/getopt.c:739 lib/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: lib/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: нераспазнаны выбар `--%s'\n"
-
-#: lib/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: нераспазнаны выбар `%c%s'\n"
-
-#: lib/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: несапраўдны выбар -- %c\n"
-
-#: lib/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: lib/getopt.c:831 lib/getopt.c:961
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: lib/getopt.c:878
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначны\n"
-
-#: lib/getopt.c:896
+#: gnulib-lib/xmalloc.c:38
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
-
-#: lib/javacomp.c:462
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
-
-#: lib/javaexec.c:414
-msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
-
-#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97
-#: src/po-lex.c:130
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
 
-#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
-#: lib/pipe-out.c:135
-msgid "cannot create pipe"
-msgstr "не магчыма стварыць канвеэр"
-
-#: lib/wait-process.c:110
-#, c-format
-msgid "%s subprocess"
-msgstr "%s падпрацэс"
-
-#: lib/wait-process.c:124
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "%s падрацэс атрымаў фатальны сігнал %d"
-
-#: src/format-c.c:760 src/format-python.c:506
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
-msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
-#: src/format-pascal.c:443 src/format-python.c:520
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
-msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
+msgid "Written by %s.\n"
+msgstr "Аўтар %s.\n"
 
-#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
-#: src/format-ycp.c:145
-#, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/envsubst.c:118
+msgid "Bruno Haible"
+msgstr ""
 
-#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
-#: src/format-ycp.c:144
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
+msgid "too many arguments"
+msgstr "вельмі шмат аргумэнтаў"
 
-#: src/format-java.c:660
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
-msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
+msgid "missing arguments"
+msgstr "прапушчаны аргумэнты"
 
-#: src/format-java.c:675
-#, c-format
-msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
-#: src/format-java.c:700
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
+#: src/envsubst.c:181
+#, fuzzy, c-format, no-wrap
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
 
-#: src/format-lisp.c:3381
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
+#: src/envsubst.c:186
+#, c-format, no-wrap
+msgid "Substitutes the values of environment variables.\n"
+msgstr ""
 
-#: src/format-lisp.c:3402
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
+#: src/envsubst.c:190
+#, c-format, no-wrap
+msgid "Operation mode:\n"
+msgstr ""
 
-#: src/format-python.c:397
-#, c-format
-msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
+#: src/envsubst.c:193
+#, c-format, no-wrap
+msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr ""
 
-#: src/format-python.c:409
-#, c-format
-msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
+#, c-format, no-wrap
+msgid "Informative output:\n"
 msgstr ""
 
-#: src/format-python.c:437
-#, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
-msgstr "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
+#: src/envsubst.c:200
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
 
-#: src/format-python.c:452
-#, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
+#: src/envsubst.c:203
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Informative output:\n"
+#| "  -h, --help                  display this help and exit\n"
+#| "  -V, --version               output version information and exit\n"
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+"Інфармацыйны вывад:\n"
+"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
+"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
 
-#: src/format-python.c:478
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
-msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
+#: src/envsubst.c:207
+#, c-format, no-wrap
+msgid ""
+"In normal operation mode, standard input is copied to standard output,\n"
+"with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
+"being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
+"only those environment variables that are referenced in SHELL-FORMAT are\n"
+"substituted; otherwise all environment variables references occurring in\n"
+"standard input are substituted.\n"
+msgstr ""
 
-#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
-#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
-#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
-#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"When --variables is used, standard input is ignored, and the output consists\n"
+"of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-"пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-"магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
 
-#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
-#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
-#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
-#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
-#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Аўтар %s.\n"
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
-msgid "too many arguments"
-msgstr "вельмі шмат аргумэнтаў"
+#: src/envsubst.c:448
+#, c-format
+msgid "error while reading \"%s\""
+msgstr "памылка ў час чытаньня \"%s\""
 
-#: src/gettext.c:168 src/ngettext.c:155
-msgid "missing arguments"
-msgstr "прапушчаны аргумэнты"
+#: src/envsubst.c:448
+msgid "standard input"
+msgstr "стандартны ўвод"
 
-#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
-#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
-#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/gettext.c:143 src/ngettext.c:132
+msgid "Ulrich Drepper"
+msgstr ""
 
-#: src/gettext.c:245
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -273,40 +200,70 @@ msgstr ""
 "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
 "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
 
-#: src/gettext.c:251
-#, no-wrap
+#: src/gettext.c:259
+#, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
 
-#: src/gettext.c:255
-#, no-wrap
+#: src/gettext.c:263
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з TEXTDOMAIN\n"
-"  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
-"  -E                        (ігнаруецца для сумяшчальнасьці)\n"
-"  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
-"  -n                        стрымлівае цягнучыеся новыя радкі\n"
-"  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
-"  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
-"                            MSGID з TEXTDOMAIN\n"
-
-#: src/gettext.c:266
-#, c-format, no-wrap
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, c-format
+msgid "  -h, --help                display this help and exit\n"
+msgstr ""
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, c-format
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+
+#: src/gettext.c:285
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#| "regular directory, another location can be specified with the environment\n"
+#| "variable TEXTDOMAINDIR.\n"
+#| "When used with the -s option the program behaves like the `echo' command.\n"
+#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#| "found in the selected catalog are translated.\n"
+#| "Standard search directory: %s\n"
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -320,2065 +277,1673 @@ msgstr ""
 "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
-#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
-#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
-
-#: src/hostname.c:209 src/msginit.c:352
+#: src/ngettext.c:218
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION]\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
-
-#: src/hostname.c:214
-#, no-wrap
-msgid "Print the machine's hostname.\n"
-msgstr "Друкуе назву вузла.\n"
-
-#: src/hostname.c:219
-#, no-wrap
-msgid ""
-"Output format:\n"
-"  -s, --short           short host name\n"
-"  -f, --fqdn, --long    long host name, includes fully qualified domain name,\n"
-"                          and aliases\n"
-"  -i, --ip-address      addresses for the hostname\n"
-msgstr ""
-"Фармат вываду:\n"
-"  -s, --short           кароткая назва вузла\n"
-"  -f, --fqdn, --long    поўная назва вузла, уключаючы поўную кваліфікаваную\n"
-"                        назву маёнтка й прозьвішчы\n"
-"  -i, --ip-address      адрас для вузла\n"
-
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
-#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
-#: src/msginit.c:394 src/urlget.c:180
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
-
-#: src/hostname.c:249 src/hostname.c:256
-msgid "could not get host name"
-msgstr "немагчыма атрымаць назву вузла"
-
-#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199
-#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232
-msgid "at most one input file allowed"
-msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
-
-#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253
-#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218
-#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317
-#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325
-#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393
-#: src/xgettext.c:397
-#, c-format
-msgid "%s and %s are mutually exclusive"
-msgstr "%s і %s узаема выключны"
+msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
+#: src/ngettext.c:223
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
-
-#: src/msgattrib.c:337
-#, no-wrap
 msgid ""
-"Filters the messages of a translation catalog according to their attributes,\n"
-"and manipulates the attributes.\n"
+"Display native language translation of a textual message whose grammatical\n"
+"form depends on a number.\n"
 msgstr ""
-"Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
-"узьдзейнічае на іх\n"
-
-#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
-#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
-#: src/msgunfmt.c:329 src/msguniq.c:296
-#, no-wrap
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
+"Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
+"граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  INPUTFILE                   input PO file\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"Файл уводу:\n"
-"  INPUTFILE                   уваходзячы PO файл\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                              файлаў\n"
-"Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
-
-#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
-#: src/msggrep.c:431 src/msgmerge.c:430
-#, no-wrap
-msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified file\n"
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
+#: src/ngettext.c:228
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 msgstr ""
-"Файл вываду:\n"
-"  -o, --output-file=ФАЙЛ      запісваць вывад у зададзены файл\n"
-"Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
-"зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:364
-#, no-wrap
-msgid ""
-"Message selection:\n"
-"      --translated            keep translated, remove untranslated messages\n"
-"      --untranslated          keep untranslated, remove translated messages\n"
-"      --no-fuzzy              remove 'fuzzy' marked messages\n"
-"      --only-fuzzy            keep 'fuzzy' marked messages\n"
-"      --no-obsolete           remove obsolete #~ messages\n"
-"      --only-obsolete         keep obsolete #~ messages\n"
-msgstr ""
-"Выбар паведамленьня:\n"
-"      --translated            пакідае перакладзеныя, прымае неперакладзеныя\n"
-"                              паведамленьні\n"
-"      --untranslated          пакідае неперакладзеныя, прымае перакладзеныя\n"
-"                              паведамленьні\n"
-"      --no-fuzzy              прымае паведамленьні, азначаныя як 'fuzzy'\n"
-"      --only-fuzzy            пакідае паведамленьні, азначаныя як 'fuzzy'\n"
-"      --no-obsolete           прымае састарэлыя #~ паведамленьні\n"
-"      --only-obsolete         пакіде састарэлыя #~ паведамленьні\n"
-
-#: src/msgattrib.c:375
-#, no-wrap
-msgid ""
-"Attribute manipulation:\n"
-"      --set-fuzzy             set all messages 'fuzzy'\n"
-"      --clear-fuzzy           set all messages non-'fuzzy'\n"
-"      --set-obsolete          set all messages obsolete\n"
-"      --clear-obsolete        set all messages non-obsolete\n"
-"      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr ""
-"Узьдзеяньне на атрыбуты:\n"
-"      --set-fuzzy             усталёўвае ўсе паведамленьні як 'fuzzy'\n"
-"      --clear-fuzzy           усталёўвае ўсе паведамленьні як не 'fuzzy'\n"
-"      --set-obsolete          усталёўвае ўсе паведамленьні як састарэлыя\n"
-"      --clear-obsolete        усталёўвае ўсе паведамленьні як несастарэлыя\n"
-"      --fuzzy                 тое, што й --only-fuzzy --clear-fuzzy\n"
-"      --obsolete              тое, што й --only-obsolete --clear-obsolete\n"
-
-#: src/msgattrib.c:386
-#, no-wrap
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"Output details:\n"
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -i, --indent                write the .po file using indented style\n"
-"      --no-location           do not write '#: filename:line' lines\n"
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
-"      --strict                write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
+"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
 msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе;\n"
-"                              без дадатковых сімвалаў\n"
-"      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-"                              пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgcat.c:259 src/msgcomm.c:282
-#, c-format
-msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
-
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:305
-#, no-wrap
-msgid ""
-"Concatenates and merges the specified PO files.\n"
-"Find messages which are common to two or more of the specified PO files.\n"
-"By using the --more-than option, greater commonality may be requested\n"
-"before messages are printed.  Conversely, the --less-than option may be\n"
-"used to specify less commonality before messages are printed (i.e.\n"
-"--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
-msgstr ""
-"Злучае й аб'ядноўвае зададзеныя PO-файлы.\n"
-"Шукае паведамленьніе якія вызначаны ў двух ці больш PO-файлах.\n"
-"Выкарытсоўвываючы выбар --more-than, можа быць запатрабавана большая\n"
-"колькасьць супадзеньняў перад тым, як будзе надрукавана певедамленьне.\n"
-"Наадварот, выбар --less-than можа быць выкарыстаны для заданьня меньшай\n"
-"колькасьці супадзеньняў (г.з. --less-than=2 будуць надрукаваны паведамленьні,\n"
-"які сутракаюцца толькі аднойчы).  Пераклады, каментары і каментары вытрымкі\n"
-"будуць аб'яднаны, за выключэньнем калі зададзен выбар --use-first, тады яны\n"
-"будуць узяты  з першага PO-файла.\n"
-"Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
-
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  INPUTFILE ...                  input files\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
-msgstr ""
-"Файл уводу:\n"
-"  УВАХОДЗЯЧЫ_ФАЙЛ ...            уваходзячыя файлы\n"
-"  -f, --files-from=ФАЙЛ          атрымліваць сьпіс уваходзячый файлаў з ФАЙЛА\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ     дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                                 файлаў\n"
-"Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
-
-#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309
-#, no-wrap
+#: src/ngettext.c:238
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE         write output to specified file\n"
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
 msgstr ""
-"Файл вываду:\n"
-"  -o, --output-file=ФАЙЛ         запісваць вывад у азначаны файл\n"
-"Вынікі запісваюцца ў стандартны вывад, калі імя файла не зададзена, ці\n"
-"замест яго -.\n"
 
-#: src/msgcat.c:340
-#, no-wrap
-msgid ""
-"Message selection:\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 0 if not set\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-"Выбар паведамленьняў:\n"
-"  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
-"                                 вызначэньняў, чым зададзена; звычайна не\n"
-"                                 абмежавана\n"
-"  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
-"                                 вызначэньняў, чым зададзена; звычайна 0\n"
-"  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-"                                 непаўторныя паведамленьні будуць надрукаваны\n"
-
-#: src/msgcat.c:352 src/msguniq.c:324
-#, no-wrap
-msgid ""
-"Output details:\n"
-"  -t, --to-code=NAME             encoding for output\n"
-"      --use-first                use first available translation for each\n"
-"                                 message, don't merge several translations\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape                не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць ESC пасьлядоўнасьці ў вывадзе,\n"
-"                                 без дадатковых сімвалаў\n"
-"      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                                 выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
-#, no-wrap
+#: src/ngettext.c:240
+#, c-format
 msgid ""
-"Informative output:\n"
-"  -h, --help                     display this help and exit\n"
-"  -V, --version                  output version information and exit\n"
+"  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                     адлюстроўвае гэту дапамогу і выходзіць\n"
-"  -V, --version                  выводзіць зьвесткі аб версіі і выходзіць\n"
-
-#: src/msgcmp.c:149 src/msgmerge.c:286
-msgid "no input files given"
-msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:154 src/msgmerge.c:291
-msgid "exactly 2 input files required"
-msgstr "патрабуецца менавіта 2 уводзячых файла"
-
-#: src/msgcmp.c:175 src/msgmerge.c:390
+#: src/ngettext.c:251
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
-
-#: src/msgcmp.c:180
-#, no-wrap
-msgid ""
-"Compare two Uniforum style .po files to check that both contain the same\n"
-"set of msgid strings.  The def.po file is an existing PO file with the\n"
-"translations.  The ref.pot file is the last created PO file, or a PO Template\n"
-"file (generally created by xgettext).  This is useful for checking that\n"
-"you have translated each and every message in your program.  Where an exact\n"
-"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
-msgstr ""
-"Параўноўвае два Uniforum .po файла, каб удакладніць, што абодва зьмяшчаюць\n"
-"аднолькавыя мноствы радкоў msgid.  Файл def.po - гэта існуючы PO файл зь\n"
-"перакладамі.  Файл ref.po - гэта апошні створаны PO файл, ці PO шаблён\n"
-"(звычайна створаны праграмай xgettext).  Гэта карысна для праверкі, што ў\n"
-"вас перакладзена кожнае паведамленьне з вашае праграмы.  Там, дзе дакладнае\n"
-"супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
-"лепшай праверкі.\n"
-
-#: src/msgcmp.c:195
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  def.po                      translations\n"
-"  ref.pot                     references to the sources\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr ""
-"Файл уводу:\n"
-"  def.po                      пераклады\n"
-"  ref.pot                     спасылкі на крыніцы\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку файлаў ўводу\n"
-
-#: src/msgcmp.c:203 src/msgmerge.c:454
-#, no-wrap
 msgid ""
-"Operation modifiers:\n"
-"  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+"regular directory, another location can be specified with the environment\n"
+"variable TEXTDOMAINDIR.\n"
+"Standard search directory: %s\n"
 msgstr ""
-"Зьмяняльнікі:\n"
-"  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def.po\n"
-
-#: src/msgcmp.c:252 src/msgmerge.c:855
-msgid "this message is used but not defined..."
-msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
-
-#: src/msgcmp.c:254 src/msgmerge.c:857
-msgid "...but this definition is similar"
-msgstr "...але гэта вызначэньне падобна"
+"Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
+"асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
+"дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+"асяроддзя TEXTDOMAINDIR.\n"
+"Стандартная дырэкторыя для пошуку: %s\n"
 
-#: src/msgcmp.c:259 src/msgmerge.c:884
 #, c-format
-msgid "this message is used but not defined in %s"
-msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
-
-#: src/msgcmp.c:331
-msgid "warning: this message is not used"
-msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
+#~ msgid "invalid argument `%s' for `%s'"
+#~ msgstr "нерэчаісны аргумэнт `%s' для `%s'"
 
-#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
-msgid "found %d fatal error"
-msgid_plural "found %d fatal errors"
-msgstr[0] "знойдзена %d фатальная памылка"
-msgstr[1] "знойдзена %d фатальныя памылкі"
-msgstr[2] "знойдзена %d фатальных памылак"
-
-#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
-msgid "duplicate message definition"
-msgstr "двайное вызначэньне паведамленьня"
-
-#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
-msgid "...this is the location of the first definition"
-msgstr "...гэта месцазнаходжаньне першага вызначэньня"
-
-#: src/msgcomm.c:271
-msgid "at least two files must be specified"
-msgstr "неабходна задаць не менш двух файлаў"
-
-#: src/msgcomm.c:321
-#, no-wrap
-msgid ""
-"Find messages which are common to two or more of the specified PO files.\n"
-"By using the --more-than option, greater commonality may be requested\n"
-"before messages are printed.  Conversely, the --less-than option may be\n"
-"used to specify less commonality before messages are printed (i.e.\n"
-"--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
-"PO file to define them.  File positions from all PO files will be\n"
-"cumulated.\n"
-msgstr ""
-"Шукае паведамленьні, агульныя для двух ці больш зададзеных PO файлаў.\n"
-"Выкарыстоўвываючы выбар --more-than, можа быць запатрабавана большая\n"
-"агульнасьць, перад тым, як будуць надрукаваны паведамленьні.  Наадварот,\n"
-"выбар --less-than можа быць выкарыстаны для запатрабаваньня меньшай\n"
-"агульнасьці перад друкам паведамленьняў (т.ч. --less-than=2 надрукуюцца)\n"
-"толькі непаўторныя памедамленьні).  Пераклады, камэнтары й здабытыя\n"
-"камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
-"вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
-
-#: src/msgcomm.c:355
-#, no-wrap
-msgid ""
-"Message selection:\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 1 if not set\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-"Выбар паведамленьняў:\n"
-"  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
-"                                 вызначэньняў, чым зададзена; звычайна не\n"
-"                                 абмежавана\n"
-"  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
-"                                 вызначэньняў, чым зададзена; звычайна 1\n"
-"  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-"                                 непаўторныя паведамленьні будуць надрукаваны\n"
-
-#: src/msgcomm.c:367
-#, no-wrap
-msgid ""
-"Output details:\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-msgstr ""
-"Падрабязнасьці вываду:n  -e, --no-escape                не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе замест дадатковых сымбаляў\n"
-"      --force-po                 запісваць PO файл, нават калі ён парожні\n"
-"  -i, --indent                   запісваць .po f файл з водступамі\n"
-"      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі\n"
-"                                 (гэты выбар выкарыстоўваецца неабумоўленым)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-"      --no-wrap                  не разьбіваць радкі доўгіх паведамленьняў,\n"
-"                                 даўжэйшыя за шырыню старонкі вываду, на\n"
-"                                 некалькі радкоў\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкоўваць вывад па шляху да файлу\n"
-"      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
-
-#: src/msgconv.c:258
-#, no-wrap
-msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
+#~ msgid "ambiguous argument `%s' for `%s'"
+#~ msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/msgconv.c:284
-#, no-wrap
-msgid ""
-"Conversion target:\n"
-"  -t, --to-code=NAME          encoding for output\n"
-"The default encoding is the current locale's encoding.\n"
-msgstr ""
-"Мэта пераўтварэньня:\n"
-"  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
-"Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
+#~ msgid "Valid arguments are:"
+#~ msgstr "Рэчаісныя аргумэнты:"
 
-#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
-#, no-wrap
-msgid ""
-"Output details:\n"
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -i, --indent                indented output style\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
-"                              без дадатковых сімвалаў\n"
-"      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-"                              пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414
-msgid "no input file given"
-msgstr "невызначан уваходзячы файл"
-
-#: src/msgen.c:197
-msgid "exactly one input file required"
-msgstr "патрабуецца менавіта адзін уваходзячы файл"
-
-#: src/msgen.c:237
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
-
-#: src/msgen.c:242
-#, no-wrap
-msgid ""
-"Creates an English translation catalog.  The input file is the last\n"
-"created English PO file, or a PO Template file (generally created by\n"
-"xgettext).  Untranslated entries are assigned a translation that is\n"
-"identical to the msgid, and are marked fuzzy.\n"
-msgstr ""
-"Стварае каталёг ангельскіх перакладаў.  Файл уводу - гэта апошні створаны\n"
-"ангельскі PO файл, ці шаблён PO файлу (звычайна створаны xgettext).\n"
-"Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
-"пазначаюцца як недакладныя (fuzzy).\n"
+#, c-format
+#~ msgid "error while opening \"%s\" for reading"
+#~ msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: src/msgen.c:255
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  INPUTFILE                   input PO or POT file\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
-msgstr ""
-"Уваходзячы файл:\n"
-"  INPUTFILE                   уваходзячы PO ці POT файл\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
-"Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+#, c-format
+#~ msgid "cannot open backup file \"%s\" for writing"
+#~ msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: src/msgexec.c:180
-msgid "missing command name"
-msgstr "прапушчана назва каманды"
+#, c-format
+#~ msgid "error reading \"%s\""
+#~ msgstr "памылка чытаньня \"%s\""
 
-#: src/msgexec.c:228
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
+#, c-format
+#~ msgid "error writing \"%s\""
+#~ msgstr "памылка запісу файла \"%s\""
 
-#: src/msgexec.c:233
-#, no-wrap
-msgid ""
-"Applies a command to all translations of a translation catalog.\n"
-"The COMMAND can be any program that reads a translation from standard\n"
-"input.  It is invoked once for each translation.  Its output becomes\n"
-"msgexec's output.  msgexec's return code is the maximum return code\n"
-"across all invocations.\n"
-msgstr ""
-"Выконвае загад над усімі перакладамі з каталёгу перакладаў. ЗАГАД можа быць\n"
-"любой праграмай, якая чытае пераклад са стандартнага ўводу.  Ён заклікаецца\n"
-"адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
-"Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
+#, c-format
+#~ msgid "error after reading \"%s\""
+#~ msgstr "памылка пасля чытаньня \"%s\""
 
-#: src/msgexec.c:242
-#, 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 ""
-"Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
-"Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
+#, c-format
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s падпрацэс спынены з-за памылкі"
 
-#: src/msgexec.c:253 src/msgfilter.c:371
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  -i, --input=INPUTFILE       input PO file\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"Уваходзячы файл:\n"
-"  -i, --input=INPUTFILE       PO файл уводу\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
-"Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n"
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: src/msgexec.c:313
-msgid "write to stdout failed"
-msgstr "памылка запісу ў stdout"
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: src/msgexec.c:337 src/msgfilter.c:610
 #, c-format
-msgid "write to %s subprocess failed"
-msgstr "памылка запісу ў падпрацэс %s"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: несапраўдны выбар -- %c\n"
 
-#: src/msgfilter.c:268
-msgid "missing filter name"
-msgstr "прапушчана назва фільтра"
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: src/msgfilter.c:292
-msgid "at least one sed script must be specified"
-msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
-#: src/msgfilter.c:356
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
+#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
+#~ msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: src/msgfilter.c:361
-#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
+#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
+#~ msgstr ""
+#~ "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: src/msgfilter.c:387
-#, no-wrap
-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 ""
-"ФІЛЬТРАМ можа быць любая праграма, якая чытае пераклады са стандартнага ўводу\n"
-"й запісвае зьмененыя пераклады ў стандартны вывад.\n"
+#~ msgid "cannot create pipe"
+#~ msgstr "не магчыма стварыць канвеэр"
 
-#: src/msgfilter.c:393
-#, no-wrap
-msgid ""
-"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
-"                                to be executed\n"
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-"Карысныя ВЫБАРы-ФІЛЬТАРУ, калі ФІЛЬТАР гэта 'sed':\n"
-"  -e, --expression=SCRIPT     дадае SCRIPT да загадаў, якія будуць выкананы\n"
-"  -f, --file=SCRIPTFILE       дадае зьмест SCRIPTFILE да загадаў, якія будуць\n"
-"                              выкананы\n"
-"  -n, --quiet, --silent       выключаць аўтаматычны друк прыклада\n"
+#, c-format
+#~ msgid "%s subprocess"
+#~ msgstr "%s падпрацэс"
 
-#: src/msgfilter.c:402
-#, no-wrap
-msgid ""
-"Output details:\n"
-"      --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"      --indent                indented output style\n"
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"      --no-escape             не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                              вывадзе, замест дадатковых сымбаляў\n"
-"      --force-po              запісваць PO файл, нават калі парожні\n"
-"      --indent                вывад з водступамі\n"
-"      --keep-header           трымаць загаловак нязьменным, не фільтраваць\n"
-"      --no-location           адкідваць радкі '#: файл:радок'\n"
-"      --add-location          дабаўляць радкі '#: файл:радок' (звычайна)\n"
-"      --strict                вывад жорстка адпаведае Uniforum\n"
-"  -w, --width=ЛІК             усталяваць шырыню вываду\n"
-"      --no-wrap               не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-"\n"
-"                              даўжэй чым шырыня, на некалькі радкоў\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па назьве файла\n"
+#, c-format
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/msgfilter.c:562
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+#~ msgid "number of format specifications in 'msgid' and '%s' does not match"
+#~ msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
 
-#: src/msgfilter.c:590
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr ""
+#~ "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
 
-#: src/msgfilter.c:641
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "памылка чытаньня з падпрацэса %s"
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
-#: src/msgfilter.c:657
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+#~ msgid "a format specification for argument %u doesn't exist in '%s'"
+#~ msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/msgfmt.c:318
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
-msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
+#~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
+#~ msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'"
 
-#: src/msgfmt.c:400 src/msgunfmt.c:241
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
-msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
+#~ msgstr ""
+#~ "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
 
-#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257
-#: src/msgunfmt.c:263
 #, c-format
-msgid "%s is only valid with %s"
-msgstr "%s рэчаісны толькі з %s"
+#~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#~ msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/msgfmt.c:422 src/msgfmt.c:428
 #, c-format
-msgid "%s is only valid with %s or %s"
-msgstr "%s рэчаісны толькі з %s ці %s"
+#~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#~ msgstr ""
+#~ "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у "
+#~ "'msgid'"
 
-#: src/msgfmt.c:501
 #, c-format
-msgid "%d translated message"
-msgid_plural "%d translated messages"
-msgstr[0] "%d паведамленьне перакладзена"
-msgstr[1] "%d паведамленьні перакладзена"
-msgstr[2] "%d паведамленьняў перакладзена"
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
 
-#: src/msgfmt.c:506
 #, c-format
-msgid ", %d fuzzy translation"
-msgid_plural ", %d fuzzy translations"
-msgstr[0] ""
-",\n"
-"%d недакладны пераклад"
-msgstr[1] ""
-",\n"
-"%d недакладных пераклада"
-msgstr[2] ""
-",\n"
-"%d недакладных перакладаў"
+#~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
+#~ msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
 
-#: src/msgfmt.c:511
 #, c-format
-msgid ", %d untranslated message"
-msgid_plural ", %d untranslated messages"
-msgstr[0] ""
-",\n"
-"%d неперакладзенае паведамленьне"
-msgstr[1] ""
-",\n"
-"%d неперакладзеных паведамленьні"
-msgstr[2] ""
-",\n"
-"%d неперакладзеных паведамленьняў"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
+#~ msgstr ""
+#~ "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
-#: src/msgfmt.c:533
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
-
-#: src/msgfmt.c:538
-#, no-wrap
-msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
+#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
+#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з TEXTDOMAIN\n"
+#~ "  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
+#~ "  -E                        (ігнаруецца для сумяшчальнасьці)\n"
+#~ "  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
+#~ "  -n                        стрымлівае цягнучыеся новыя радкі\n"
+#~ "  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
+#~ "  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
+#~ "                            MSGID з TEXTDOMAIN\n"
 
-#: src/msgfmt.c:548
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  filename.po ...             input files\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
-msgstr ""
-"Файл уводу:\n"
-"  файл.po ...                 файл уводу\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                              файлаў\n"
-"Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
-
-#: src/msgfmt.c:556
-#, no-wrap
-msgid ""
-"Operation mode:\n"
-"  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"Рэжым дзеяньня:\n"
-"  -j, --java                  Java рэжым: ствараць Java ResourceBundle кляс\n"
-"      --java2                 як --java, але ў дачыненьні Java2 (JDK 1.2 ці\n"
-"                              больш позьняя вэрсія)\n"
-"      --tcl                   Tcl рэжым: ствараць tcl/msgcat .msg файл\n"
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION]\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/msgfmt.c:564
 #, no-wrap
-msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified file\n"
-"      --strict                enable strict Uniforum mode\n"
-"If output file is -, output is written to standard output.\n"
-msgstr ""
-"Файл вываду:\n"
-"  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
-"      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
-"Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
+#~ msgid "Print the machine's hostname.\n"
+#~ msgstr "Друкуе назву вузла.\n"
 
-#: src/msgfmt.c:572
-#, no-wrap
-msgid ""
-"Output file location in Java mode:\n"
-"  -r, --resource=RESOURCE     resource name\n"
-"  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
-"The class name is determined by appending the locale name to the resource name,\n"
-"separated with an underscore.  The -d option is mandatory.  The class is\n"
-"written under the specified directory.\n"
-msgstr ""
-"Файл вываду ў рэжыме Java:\n"
-"  -r, --resource=СРОДАК       назва сродка\n"
-"  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый клясаў\n"
-"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы сродка\n"
-"абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
-"зададзеную дырэкторыю.\n"
-
-#: src/msgfmt.c:583
 #, no-wrap
-msgid ""
-"Output file location in Tcl mode:\n"
-"  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-"  -d DIRECTORY                base directory of .msg message catalogs\n"
-"The -l and -d options are mandatory.  The .msg file is written in the\n"
-"specified directory.\n"
-msgstr ""
-"Файл вываду ў рэжыме Tcl:\n"
-"  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя .msg каталёгаў паведамленьняў\n"
-"Выбары -l і -d абавязковыя.  Файл .msg запісваецца ў зададзеную дырэкторыю.\n"
+#~ msgid ""
+#~ "Output format:\n"
+#~ "  -s, --short           short host name\n"
+#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain name,\n"
+#~ "                          and aliases\n"
+#~ "  -i, --ip-address      addresses for the hostname\n"
+#~ msgstr ""
+#~ "Фармат вываду:\n"
+#~ "  -s, --short           кароткая назва вузла\n"
+#~ "  -f, --fqdn, --long    поўная назва вузла, уключаючы поўную кваліфікаваную\n"
+#~ "                        назву маёнтка й прозьвішчы\n"
+#~ "  -i, --ip-address      адрас для вузла\n"
 
-#: src/msgfmt.c:592
-#, no-wrap
-msgid ""
-"Input file interpretation:\n"
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
-"      --check-format          check language dependent format strings\n"
-"      --check-header          verify presence and contents of the header entry\n"
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
-"                                menu items\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
-"Успрыняцьце файла ўводу:\n"
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
-"      --check-format          check language dependent format strings\n"
-"      --check-header          verify presence and contents of the header entry\n"
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
-"                                menu items\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
-
-#: src/msgfmt.c:607
-#, c-format, no-wrap
-msgid ""
-"Output details:\n"
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-"      --no-hash               binary file will not include the hash table\n"
-msgstr ""
-"Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: %d)\n"
-"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
+#~ msgid "could not get host name"
+#~ msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgfmt.c:614
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"      --statistics            print statistics about translations\n"
-"  -v, --verbose               increase verbosity level\n"
-msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
-"      --statistics            друкуе статыстыку аб перакладах\n"
-"  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
+#~ msgid "at most one input file allowed"
+#~ msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
 
-#: src/msgfmt.c:766
-msgid "plural expression can produce negative values"
-msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
-
-#: src/msgfmt.c:779
 #, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
+#~ msgid "%s and %s are mutually exclusive"
+#~ msgstr "%s і %s узаема выключны"
 
-#: src/msgfmt.c:805
-msgid "plural expression can produce division by zero"
-msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] [INPUTFILE]\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Filters the messages of a translation catalog according to their attributes,\n"
+#~ "and manipulates the attributes.\n"
+#~ msgstr ""
+#~ "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
+#~ "узьдзейнічае на іх\n"
+
+#, no-wrap
+#~ msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ msgstr "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  INPUTFILE                   уваходзячы PO файл\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                              файлаў\n"
+#~ "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "The results are written to standard output if no output file is specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ      запісваць вывад у зададзены файл\n"
+#~ "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
+#~ "зададзена, ці замест яго -.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "      --translated            keep translated, remove untranslated messages\n"
+#~ "      --untranslated          keep untranslated, remove translated messages\n"
+#~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+#~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+#~ "      --no-obsolete           remove obsolete #~ messages\n"
+#~ "      --only-obsolete         keep obsolete #~ messages\n"
+#~ msgstr ""
+#~ "Выбар паведамленьня:\n"
+#~ "      --translated            пакідае перакладзеныя, прымае неперакладзеныя\n"
+#~ "                              паведамленьні\n"
+#~ "      --untranslated          пакідае неперакладзеныя, прымае перакладзеныя\n"
+#~ "                              паведамленьні\n"
+#~ "      --no-fuzzy              прымае паведамленьні, азначаныя як 'fuzzy'\n"
+#~ "      --only-fuzzy            пакідае паведамленьні, азначаныя як 'fuzzy'\n"
+#~ "      --no-obsolete           прымае састарэлыя #~ паведамленьні\n"
+#~ "      --only-obsolete         пакіде састарэлыя #~ паведамленьні\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Attribute manipulation:\n"
+#~ "      --set-fuzzy             set all messages 'fuzzy'\n"
+#~ "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+#~ "      --set-obsolete          set all messages obsolete\n"
+#~ "      --clear-obsolete        set all messages non-obsolete\n"
+#~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+#~ msgstr ""
+#~ "Узьдзеяньне на атрыбуты:\n"
+#~ "      --set-fuzzy             усталёўвае ўсе паведамленьні як 'fuzzy'\n"
+#~ "      --clear-fuzzy           усталёўвае ўсе паведамленьні як не 'fuzzy'\n"
+#~ "      --set-obsolete          усталёўвае ўсе паведамленьні як састарэлыя\n"
+#~ "      --clear-obsolete        усталёўвае ўсе паведамленьні як несастарэлыя\n"
+#~ "      --fuzzy                 тое, што й --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              тое, што й --only-obsolete --clear-obsolete\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                write the .po file using indented style\n"
+#~ "      --no-location           do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе;\n"
+#~ "                              без дадатковых сімвалаў\n"
+#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                              пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#, c-format
+#~ msgid "impossible selection criteria specified (%d < n < %d)"
+#~ msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgfmt.c:810
-msgid "plural expression can produce integer overflow"
-msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Concatenates and merges the specified PO files.\n"
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be cumulated, except that if --use-first\n"
+#~ "is specified, they will be taken from the first PO file to define them.\n"
+#~ "File positions from all PO files will be cumulated.\n"
+#~ msgstr ""
+#~ "Злучае й аб'ядноўвае зададзеныя PO-файлы.\n"
+#~ "Шукае паведамленьніе якія вызначаны ў двух ці больш PO-файлах.\n"
+#~ "Выкарытсоўвываючы выбар --more-than, можа быць запатрабавана большая\n"
+#~ "колькасьць супадзеньняў перад тым, як будзе надрукавана певедамленьне.\n"
+#~ "Наадварот, выбар --less-than можа быць выкарыстаны для заданьня меньшай\n"
+#~ "колькасьці супадзеньняў (г.з. --less-than=2 будуць надрукаваны паведамленьні,\n"
+#~ "які сутракаюцца толькі аднойчы).  Пераклады, каментары і каментары вытрымкі\n"
+#~ "будуць аб'яднаны, за выключэньнем калі зададзен выбар --use-first, тады яны\n"
+#~ "будуць узяты  з першага PO-файла.\n"
+#~ "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE ...                  input files\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  УВАХОДЗЯЧЫ_ФАЙЛ ...            уваходзячыя файлы\n"
+#~ "  -f, --files-from=ФАЙЛ          атрымліваць сьпіс уваходзячый файлаў з ФАЙЛА\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ     дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                                 файлаў\n"
+#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE         write output to specified file\n"
+#~ "The results are written to standard output if no output file is specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ         запісваць вывад у азначаны файл\n"
+#~ "Вынікі запісваюцца ў стандартны вывад, калі імя файла не зададзена, ці\n"
+#~ "замест яго -.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна не\n"
+#~ "                                 абмежавана\n"
+#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна 0\n"
+#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
+#~ "                                 непаўторныя паведамленьні будуць надрукаваны\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for each\n"
+#~ "                                 message, don't merge several translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape                не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                                 без дадатковых сімвалаў\n"
+#~ "      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                                 выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                     адлюстроўвае гэту дапамогу і выходзіць\n"
+#~ "  -V, --version                  выводзіць зьвесткі аб версіі і выходзіць\n"
+
+#~ msgid "no input files given"
+#~ msgstr "не зададзены ўводзячыя файлы"
+
+#~ msgid "exactly 2 input files required"
+#~ msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgfmt.c:815
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr ""
-"выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
-"дзяленьне на нуль"
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] def.po ref.pot\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Compare two Uniforum style .po files to check that both contain the same\n"
+#~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+#~ "file (generally created by xgettext).  This is useful for checking that\n"
+#~ "you have translated each and every message in your program.  Where an exact\n"
+#~ "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ msgstr ""
+#~ "Параўноўвае два Uniforum .po файла, каб удакладніць, што абодва зьмяшчаюць\n"
+#~ "аднолькавыя мноствы радкоў msgid.  Файл def.po - гэта існуючы PO файл зь\n"
+#~ "перакладамі.  Файл ref.po - гэта апошні створаны PO файл, ці PO шаблён\n"
+#~ "(звычайна створаны праграмай xgettext).  Гэта карысна для праверкі, што ў\n"
+#~ "вас перакладзена кожнае паведамленьне з вашае праграмы.  Там, дзе дакладнае\n"
+#~ "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
+#~ "лепшай праверкі.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations\n"
+#~ "  ref.pot                     references to the sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  def.po                      пераклады\n"
+#~ "  ref.pot                     спасылкі на крыніцы\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку файлаў ўводу\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Operation modifiers:\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+#~ msgstr ""
+#~ "Зьмяняльнікі:\n"
+#~ "  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def.po\n"
+
+#~ msgid "this message is used but not defined..."
+#~ msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
+
+#~ msgid "...but this definition is similar"
+#~ msgstr "...але гэта вызначэньне падобна"
+
+#, c-format
+#~ msgid "this message is used but not defined in %s"
+#~ msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
+
+#~ msgid "warning: this message is not used"
+#~ msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
+
+#, c-format
+#~ msgid "found %d fatal error"
+#~ msgid_plural "found %d fatal errors"
+#~ msgstr[0] "знойдзена %d фатальная памылка"
+#~ msgstr[1] "знойдзена %d фатальныя памылкі"
+#~ msgstr[2] "знойдзена %d фатальных памылак"
+
+#~ msgid "duplicate message definition"
+#~ msgstr "двайное вызначэньне паведамленьня"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...гэта месцазнаходжаньне першага вызначэньня"
+
+#~ msgid "at least two files must be specified"
+#~ msgstr "неабходна задаць не менш двух файлаў"
+
+#, no-wrap
+#~ msgid ""
+#~ "Find messages which are common to two or more of the specified PO files.\n"
+#~ "By using the --more-than option, greater commonality may be requested\n"
+#~ "before messages are printed.  Conversely, the --less-than option may be\n"
+#~ "used to specify less commonality before messages are printed (i.e.\n"
+#~ "--less-than=2 will only print the unique messages).  Translations,\n"
+#~ "comments and extract comments will be preserved, but only from the first\n"
+#~ "PO file to define them.  File positions from all PO files will be\n"
+#~ "cumulated.\n"
+#~ msgstr ""
+#~ "Шукае паведамленьні, агульныя для двух ці больш зададзеных PO файлаў.\n"
+#~ "Выкарыстоўвываючы выбар --more-than, можа быць запатрабавана большая\n"
+#~ "агульнасьць, перад тым, як будуць надрукаваны паведамленьні.  Наадварот,\n"
+#~ "выбар --less-than можа быць выкарыстаны для запатрабаваньня меньшай\n"
+#~ "агульнасьці перад друкам паведамленьняў (т.ч. --less-than=2 надрукуюцца)\n"
+#~ "толькі непаўторныя памедамленьні).  Пераклады, камэнтары й здабытыя\n"
+#~ "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
+#~ "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 1 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна не\n"
+#~ "                                 абмежавана\n"
+#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна 1\n"
+#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
+#~ "                                 непаўторныя паведамленьні будуць надрукаваны\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ msgstr ""
+#~ "Падрабязнасьці вываду:n  -e, --no-escape                не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе замест дадатковых сымбаляў\n"
+#~ "      --force-po                 запісваць PO файл, нават калі ён парожні\n"
+#~ "  -i, --indent                   запісваць .po f файл з водступамі\n"
+#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі\n"
+#~ "                                 (гэты выбар выкарыстоўваецца неабумоўленым)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
+#~ "      --no-wrap                  не разьбіваць радкі доўгіх паведамленьняў,\n"
+#~ "                                 даўжэйшыя за шырыню старонкі вываду, на\n"
+#~ "                                 некалькі радкоў\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкоўваць вывад па шляху да файлу\n"
+#~ "      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
+
+#, no-wrap
+#~ msgid "Converts a translation catalog to a different character encoding.\n"
+#~ msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Conversion target:\n"
+#~ "  -t, --to-code=NAME          encoding for output\n"
+#~ "The default encoding is the current locale's encoding.\n"
+#~ msgstr ""
+#~ "Мэта пераўтварэньня:\n"
+#~ "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
+#~ "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                              без дадатковых сімвалаў\n"
+#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                              пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#~ msgid "no input file given"
+#~ msgstr "невызначан уваходзячы файл"
+
+#~ msgid "exactly one input file required"
+#~ msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgfmt.c:894 src/msgfmt.c:906
-msgid "message catalog has plural form translations..."
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] INPUTFILE\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Creates an English translation catalog.  The input file is the last\n"
+#~ "created English PO file, or a PO Template file (generally created by\n"
+#~ "xgettext).  Untranslated entries are assigned a translation that is\n"
+#~ "identical to the msgid, and are marked fuzzy.\n"
+#~ msgstr ""
+#~ "Стварае каталёг ангельскіх перакладаў.  Файл уводу - гэта апошні створаны\n"
+#~ "ангельскі PO файл, ці шаблён PO файлу (звычайна створаны xgettext).\n"
+#~ "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
+#~ "пазначаюцца як недакладныя (fuzzy).\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO or POT file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Уваходзячы файл:\n"
+#~ "  INPUTFILE                   уваходзячы PO ці POT файл\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+
+#~ msgid "missing command name"
+#~ msgstr "прапушчана назва каманды"
 
-#: src/msgfmt.c:897
-msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
 
-#: src/msgfmt.c:909
-msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
+#, no-wrap
+#~ msgid ""
+#~ "Applies a command to all translations of a translation catalog.\n"
+#~ "The COMMAND can be any program that reads a translation from standard\n"
+#~ "input.  It is invoked once for each translation.  Its output becomes\n"
+#~ "msgexec's output.  msgexec's return code is the maximum return code\n"
+#~ "across all invocations.\n"
+#~ msgstr ""
+#~ "Выконвае загад над усімі перакладамі з каталёгу перакладаў. ЗАГАД можа быць\n"
+#~ "любой праграмай, якая чытае пераклад са стандартнага ўводу.  Ён заклікаецца\n"
+#~ "адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
+#~ "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
 
-#: src/msgfmt.c:934
-msgid "invalid nplurals value"
-msgstr "нерэчаіснае значэньне nplurals"
+#, 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 ""
+#~ "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
+#~ "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgfmt.c:948
-msgid "invalid plural expression"
-msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  -i, --input=INPUTFILE       input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Уваходзячы файл:\n"
+#~ "  -i, --input=INPUTFILE       PO файл уводу\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+#~ "Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n"
 
-#: src/msgfmt.c:967 src/msgfmt.c:982
-#, c-format
-msgid "nplurals = %lu..."
-msgstr "nplurals = %lu..."
+#~ msgid "write to stdout failed"
+#~ msgstr "памылка запісу ў stdout"
 
-#: src/msgfmt.c:970
 #, c-format
-msgid "...but some messages have only one plural form"
-msgid_plural "...but some messages have only %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
-msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
-msgstr[2] "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
+#~ msgid "write to %s subprocess failed"
+#~ msgstr "памылка запісу ў падпрацэс %s"
 
-#: src/msgfmt.c:985
-#, c-format
-msgid "...but some messages have one plural form"
-msgid_plural "...but some messages have %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
-msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
-msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
+#~ msgid "missing filter name"
+#~ msgstr "прапушчана назва фільтра"
 
-#: src/msgfmt.c:1015
-#, c-format
-msgid "Try using the following, valid for %s:\n"
-msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
+#~ msgid "at least one sed script must be specified"
+#~ msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfmt.c:1028
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr ""
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfmt.c:1066
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
+#, no-wrap
+#~ msgid "Applies a filter to all translations of a translation catalog.\n"
+#~ msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfmt.c:1076
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
+#, no-wrap
+#~ 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 ""
+#~ "ФІЛЬТРАМ можа быць любая праграма, якая чытае пераклады са стандартнага ўводу\n"
+#~ "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfmt.c:1088
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
+#, no-wrap
+#~ msgid ""
+#~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+#~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+#~ "                                to be executed\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+#~ msgstr ""
+#~ "Карысныя ВЫБАРы-ФІЛЬТАРУ, калі ФІЛЬТАР гэта 'sed':\n"
+#~ "  -e, --expression=SCRIPT     дадае SCRIPT да загадаў, якія будуць выкананы\n"
+#~ "  -f, --file=SCRIPTFILE       дадае зьмест SCRIPTFILE да загадаў, якія будуць\n"
+#~ "                              выкананы\n"
+#~ "  -n, --quiet, --silent       выключаць аўтаматычны друк прыклада\n"
 
-#: src/msgfmt.c:1105
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "      --no-escape             не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                              вывадзе, замест дадатковых сымбаляў\n"
+#~ "      --force-po              запісваць PO файл, нават калі парожні\n"
+#~ "      --indent                вывад з водступамі\n"
+#~ "      --keep-header           трымаць загаловак нязьменным, не фільтраваць\n"
+#~ "      --no-location           адкідваць радкі '#: файл:радок'\n"
+#~ "      --add-location          дабаўляць радкі '#: файл:радок' (звычайна)\n"
+#~ "      --strict                вывад жорстка адпаведае Uniforum\n"
+#~ "  -w, --width=ЛІК             усталяваць шырыню вываду\n"
+#~ "      --no-wrap               не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+#~ "\n"
+#~ "                              даўжэй чым шырыня, на некалькі радкоў\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па назьве файла\n"
 
-#: src/msgfmt.c:1115
 #, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
-
-#: src/msgfmt.c:1127
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
 
-#: src/msgfmt.c:1139
-msgid "plural handling is a GNU gettext extension"
-msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
+#, c-format
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
 
-#: src/msgfmt.c:1204
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'"
-msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "памылка чытаньня з падпрацэса %s"
 
-#: src/msgfmt.c:1242
 #, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr ""
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msgfmt.c:1250
 #, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
+#~ msgid "the argument to %s should be a single punctuation character"
+#~ msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:1285
 #, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+#~ msgid "%s requires a \"-d directory\" specification"
+#~ msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
 
-#: src/msgfmt.c:1289
 #, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+#~ msgid "%s requires a \"-l locale\" specification"
+#~ msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:1300
-msgid "some header fields still have the initial default value\n"
-msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
+#, c-format
+#~ msgid "%s is only valid with %s"
+#~ msgstr "%s рэчаісны толькі з %s"
 
-#: src/msgfmt.c:1312
 #, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+#~ msgid "%s is only valid with %s or %s"
+#~ msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:1354
-msgid "warning: PO file header missing or invalid\n"
-msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
+#, c-format
+#~ msgid "%d translated message"
+#~ msgid_plural "%d translated messages"
+#~ msgstr[0] "%d паведамленьне перакладзена"
+#~ msgstr[1] "%d паведамленьні перакладзена"
+#~ msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:1357
-msgid "warning: charset conversion will not work\n"
-msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
+#, c-format
+#~ msgid ", %d fuzzy translation"
+#~ msgid_plural ", %d fuzzy translations"
+#~ msgstr[0] ""
+#~ ",\n"
+#~ "%d недакладны пераклад"
+#~ msgstr[1] ""
+#~ ",\n"
+#~ "%d недакладных пераклада"
+#~ msgstr[2] ""
+#~ ",\n"
+#~ "%d недакладных перакладаў"
+
+#, c-format
+#~ msgid ", %d untranslated message"
+#~ msgid_plural ", %d untranslated messages"
+#~ msgstr[0] ""
+#~ ",\n"
+#~ "%d неперакладзенае паведамленьне"
+#~ msgstr[1] ""
+#~ ",\n"
+#~ "%d неперакладзеных паведамленьні"
+#~ msgstr[2] ""
+#~ ",\n"
+#~ "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:1367
-msgid "warning: PO file header fuzzy\n"
-msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] filename.po ...\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
+
+#, no-wrap
+#~ msgid "Generate binary message catalog from textual translation description.\n"
+#~ msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  filename.po ...             input files\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  файл.po ...                 файл уводу\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                              файлаў\n"
+#~ "Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+#~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "Рэжым дзеяньня:\n"
+#~ "  -j, --java                  Java рэжым: ствараць Java ResourceBundle кляс\n"
+#~ "      --java2                 як --java, але ў дачыненьні Java2 (JDK 1.2 ці\n"
+#~ "                              больш позьняя вэрсія)\n"
+#~ "      --tcl                   Tcl рэжым: ствараць tcl/msgcat .msg файл\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
+#~ "      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
+#~ "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location in Java mode:\n"
+#~ "  -r, --resource=RESOURCE     resource name\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+#~ "The class name is determined by appending the locale name to the resource name,\n"
+#~ "separated with an underscore.  The -d option is mandatory.  The class is\n"
+#~ "written under the specified directory.\n"
+#~ msgstr ""
+#~ "Файл вываду ў рэжыме Java:\n"
+#~ "  -r, --resource=СРОДАК       назва сродка\n"
+#~ "  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
+#~ "  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый клясаў\n"
+#~ "Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы сродка\n"
+#~ "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
+#~ "зададзеную дырэкторыю.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Файл вываду ў рэжыме Tcl:\n"
+#~ "  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
+#~ "  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя .msg каталёгаў паведамленьняў\n"
+#~ "Выбары -l і -d абавязковыя.  Файл .msg запісваецца ў зададзеную дырэкторыю.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file interpretation:\n"
+#~ "  -c, --check                 perform all the checks implied by\n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          check language dependent format strings\n"
+#~ "      --check-header          verify presence and contents of the header entry\n"
+#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "                                and the --output-file option\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "                                menu items\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ msgstr ""
+#~ "Успрыняцьце файла ўводу:\n"
+#~ "  -c, --check                 perform all the checks implied by\n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          check language dependent format strings\n"
+#~ "      --check-header          verify presence and contents of the header entry\n"
+#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "                                and the --output-file option\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "                                menu items\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:1369
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+#~ "      --no-hash               binary file will not include the hash table\n"
+#~ msgstr ""
+#~ "Падрабязнасьці вываду:\n"
+#~ "  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: %d)\n"
+#~ "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:1394
-#, c-format
-msgid "domain name \"%s\" not suitable as file name"
-msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
+#~ "  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
+#~ "      --statistics            друкуе статыстыку аб перакладах\n"
+#~ "  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
 
-#: src/msgfmt.c:1399
-#, c-format
-msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-"даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
-"будзе выкарыстаны прэфікс"
+#~ msgid "plural expression can produce negative values"
+#~ msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
 
-#: src/msgfmt.c:1410
 #, c-format
-msgid "`domain %s' directive ignored"
-msgstr "дырэктыва `domain %s' ігнаруецца"
+#~ msgid ""
+#~ "nplurals = %lu but plural expression can produce values as large as %lu"
+#~ msgstr ""
+#~ "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як "
+#~ "%lu"
 
-#: src/msgfmt.c:1484
-msgid "empty `msgstr' entry ignored"
-msgstr "парожняе уваходжаньне `msgstr' прапушчана"
+#~ msgid "plural expression can produce division by zero"
+#~ msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
 
-#: src/msgfmt.c:1485
-msgid "fuzzy `msgstr' entry ignored"
-msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
+#~ msgid "plural expression can produce integer overflow"
+#~ msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
 
-#: src/msgfmt.c:1554
-#, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
+#~ msgid ""
+#~ "plural expression can produce arithmetic exceptions, possibly division by "
+#~ "zero"
+#~ msgstr ""
+#~ "выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
+#~ "дзяленьне на нуль"
 
-#: src/msggrep.c:390
-#, c-format
-msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
-msgstr "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
+#~ msgid "message catalog has plural form translations..."
+#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msggrep.c:412
-#, 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 ""
+#~ msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
+#~ msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
 
-#: src/msggrep.c:439
-#, no-wrap
-msgid ""
-"Message selection:\n"
-"  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
-"  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
-"A message is selected if it comes from one of the specified source files,\n"
-"or if it comes from one of the specified domains,\n"
-"or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
-"or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
-"or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
-"\n"
-"When more than one selection criterion is specified, the set of selected\n"
-"messages is the union of the selected messages of each criterion.\n"
-"\n"
-"MSGID-PATTERN or MSGSTR-PATTERN syntax:\n"
-"  [-E | -F] [-e PATTERN | -f FILE]...\n"
-"PATTERNs are basic regular expressions by default, or extended regular\n"
-"expressions if -E is given, or fixed strings if -F is given.\n"
-"\n"
-"  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
-"  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
-"  -K, --msgid                 start of patterns for the msgid\n"
-"  -T, --msgstr                start of patterns for the msgstr\n"
-"  -E, --extended-regexp       PATTERN is an extended regular expression\n"
-"  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
-"  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
-"  -f, --file=FILE             obtain PATTERN from FILE\n"
-"  -i, --ignore-case           ignore case distinctions\n"
-msgstr ""
+#~ msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
+#~ msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msggrep.c:469
-#, no-wrap
-msgid ""
-"Output details:\n"
-"      --no-escape             do not use C escapes in output (default)\n"
-"      --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"      --indent                indented output style\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"      --sort-output           generate sorted output\n"
-"      --sort-by-file          sort output by file location\n"
-msgstr ""
+#~ msgid "invalid nplurals value"
+#~ msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msggrep.c:561
-msgid "write to grep subprocess failed"
-msgstr "памылка запісу ў падпрацэс grep"
-
-#: src/msginit.c:284
-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 ""
+#~ msgid "invalid plural expression"
+#~ msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
 
-#: src/msginit.c:312
 #, c-format
-msgid ""
-"Output file %s already exists.\n"
-"Please specify the locale through the --locale option or\n"
-"the output .po file through the --output-file option.\n"
-msgstr ""
-"Файл вываду %s ужо існуе.\n"
-"Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
-"ці .po файл вываду з дапамогай выбару --output-file.\n"
+#~ msgid "nplurals = %lu..."
+#~ msgstr "nplurals = %lu..."
 
-#: src/msginit.c:335
 #, c-format
-msgid "Created %s.\n"
-msgstr "Створан %s.\n"
-
-#: src/msginit.c:357
-#, no-wrap
-msgid ""
-"Creates a new PO file, initializing the meta information with values from the\n"
-"user's environment.\n"
-msgstr ""
-"Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
-"карыстальніка.\n"
+#~ msgid "...but some messages have only one plural form"
+#~ msgid_plural "...but some messages have only %lu plural forms"
+#~ msgstr[0] ""
+#~ "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
+#~ msgstr[1] ""
+#~ "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
+#~ msgstr[2] ""
+#~ "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
 
-#: src/msginit.c:368
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  -i, --input=INPUTFILE       input POT file\n"
-"If no input file is given, the current directory is searched for the POT file.\n"
-"If it is -, standard input is read.\n"
-msgstr ""
-
-#: src/msginit.c:376
-#, no-wrap
-msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified PO file\n"
-"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 ""
+#, c-format
+#~ msgid "...but some messages have one plural form"
+#~ msgid_plural "...but some messages have %lu plural forms"
+#~ msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
+#~ msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
+#~ msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
 
-#: src/msginit.c:384
-#, no-wrap
-msgid ""
-"Output details:\n"
-"  -l, --locale=LL_CC          set target locale\n"
-"      --no-translator         assume the PO file is automatically generated\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-msgstr ""
+#, c-format
+#~ msgid "Try using the following, valid for %s:\n"
+#~ msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
 
-#: src/msginit.c:437
-msgid ""
-"Found more than one .pot file.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-"Знойдзен больш чым адзін .pot файл.\n"
-"Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
+#~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#~ msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
 
-#: src/msginit.c:445 src/msginit.c:450
-msgid "error reading current directory"
-msgstr "памылка чытаньня бягучай дырэкторыі"
+#, c-format
+#~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#~ msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msginit.c:458
-msgid ""
-"Found no .pot file in the current directory.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-"Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
-"Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
+#~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#~ msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165
-#: src/read-java.c:80
-msgid "fdopen() failed"
-msgstr "fdopen() памылка"
+#~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#~ msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
 
-#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103
 #, c-format
-msgid "%s subprocess I/O error"
-msgstr "падпрацэс %s, памылка ўводу-вываду"
+#~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#~ msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179
-#: src/read-java.c:90
-#, c-format
-msgid "%s subprocess failed with exit code %d"
-msgstr ""
+#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#~ msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msginit.c:1088
-msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
-"you in case of unexpected technical problems.\n"
-msgstr ""
+#~ msgid "plural handling is a GNU gettext extension"
+#~ msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
 
-#. TRANSLATORS: "English" needs to be replaced by your language.
-#. For example in it.po write "Traduzioni italiani ...",
-#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1432
 #, c-format
-msgid "English translations for %s package"
-msgstr "Беларускі пераклад для %s"
+#~ msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+#~ msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
-msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
+#~ msgid "headerfield `%s' missing in header\n"
+#~ msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
-#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
-msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
 
-#: src/msgl-cat.c:209
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
-msgstr ""
-"уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
-"са сьпецыфікацыей кодавай старонкі"
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgl-cat.c:213
 #, c-format
-msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
-msgstr ""
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
 
-#: src/msgl-cat.c:374 src/msgl-iconv.c:406
-#, c-format
-msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
+#~ msgid "warning: PO file header missing or invalid\n"
+#~ msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
-msgid "warning: "
-msgstr "увага: "
+#~ msgid "warning: charset conversion will not work\n"
+#~ msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgl-cat.c:425
-msgid ""
-"Input files contain messages in different encodings, UTF-8 among others.\n"
-"Converting the output to UTF-8.\n"
-msgstr ""
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgl-cat.c:431
 #, c-format
-msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
-"Converting the output to UTF-8.\n"
-"To select a different output encoding, use the --to-code option.\n"
-msgstr ""
+#~ msgid "domain name \"%s\" not suitable as file name"
+#~ msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgl-charset.c:93
 #, c-format
-msgid ""
-"Locale charset \"%s\" is different from\n"
-"input file charset \"%s\".\n"
-"Output of '%s' might be incorrect.\n"
-"Possible workarounds are:\n"
-msgstr ""
+#~ msgid "domain name \"%s\" not suitable as file name: will use prefix"
+#~ msgstr ""
+#~ "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
+#~ "будзе выкарыстаны прэфікс"
 
-#: src/msgl-charset.c:100
 #, c-format
-msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr ""
+#~ msgid "`domain %s' directive ignored"
+#~ msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgl-charset.c:105
-#, c-format
-msgid ""
-"- Convert the translation catalog to %s using 'msgconv',\n"
-"  then apply '%s',\n"
-"  then convert back to %s using 'msgconv'.\n"
-msgstr ""
+#~ msgid "empty `msgstr' entry ignored"
+#~ msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgl-charset.c:114
-#, c-format
-msgid ""
-"- Set LC_ALL to a locale with encoding %s,\n"
-"  convert the translation catalog to %s using 'msgconv',\n"
-"  then apply '%s',\n"
-"  then convert back to %s using 'msgconv'.\n"
-msgstr ""
+#~ msgid "fuzzy `msgstr' entry ignored"
+#~ msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgl-charset.c:128
 #, c-format
-msgid ""
-"Locale charset \"%s\" is not a portable encoding name.\n"
-"Output of '%s' might be incorrect.\n"
-"A possible workaround is to set LC_ALL=C.\n"
-msgstr ""
+#~ msgid "%s: warning: source file contains fuzzy translation"
+#~ msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
-msgid "conversion failure"
-msgstr "памылка пераўтварэньня"
+#, c-format
+#~ msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
+#~ msgstr ""
+#~ "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
 
-#: src/msgl-iconv.c:351
-msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "памылка запісу ў падпрацэс grep"
 
-#: src/msgl-iconv.c:369
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr ""
+#~ msgid ""
+#~ "Output file %s already exists.\n"
+#~ "Please specify the locale through the --locale option or\n"
+#~ "the output .po file through the --output-file option.\n"
+#~ msgstr ""
+#~ "Файл вываду %s ужо існуе.\n"
+#~ "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
+#~ "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msgl-iconv.c:385
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr ""
-
-#: src/msgmerge.c:358
-msgid "backup type"
-msgstr ""
+#~ msgid "Created %s.\n"
+#~ msgstr "Створан %s.\n"
 
-#: src/msgmerge.c:395
 #, no-wrap
-msgid ""
-"Merges two Uniforum style .po files together.  The def.po file is an\n"
-"existing PO file with translations which will be taken over to the newly\n"
-"created file as long as they still match; comments will be preserved,\n"
-"but extracted comments and file positions will be discarded.  The ref.pot\n"
-"file is the last created PO file with up-to-date source references but\n"
-"old translations, or a PO Template file (generally created by xgettext);\n"
-"any translations or comments in the file will be discarded, however dot\n"
-"comments and file positions will be preserved.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better results.\n"
-msgstr ""
+#~ msgid ""
+#~ "Creates a new PO file, initializing the meta information with values from the\n"
+#~ "user's environment.\n"
+#~ msgstr ""
+#~ "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
+#~ "карыстальніка.\n"
 
-#: src/msgmerge.c:413
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  def.po                      translations referring to old sources\n"
-"  ref.pot                     references to new sources\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -C, --compendium=FILE       additional library of message translations,\n"
-"                              may be specified more than once\n"
-msgstr ""
+#~ msgid ""
+#~ "Found more than one .pot file.\n"
+#~ "Please specify the input .pot file through the --input option.\n"
+#~ msgstr ""
+#~ "Знойдзен больш чым адзін .pot файл.\n"
+#~ "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msgmerge.c:423
-#, no-wrap
-msgid ""
-"Operation mode:\n"
-"  -U, --update                update def.po,\n"
-"                              do nothing if def.po already up to date\n"
-msgstr ""
+#~ msgid "error reading current directory"
+#~ msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msgmerge.c:438
-#, no-wrap
-msgid ""
-"Output file location in update mode:\n"
-"The result is written back to def.po.\n"
-"      --backup=CONTROL        make a backup of def.po\n"
-"      --suffix=SUFFIX         override the usual backup suffix\n"
-"The version control method may be selected via the --backup option or through\n"
-"the VERSION_CONTROL environment variable.  Here are the values:\n"
-"  none, off       never make backups (even if --backup is given)\n"
-"  numbered, t     make numbered backups\n"
-"  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-"  simple, never   always make simple backups\n"
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
-"environment variable.\n"
-msgstr ""
-
-#: src/msgmerge.c:477
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"  -v, --verbose               increase verbosity level\n"
-"  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
-"  -v, --verbose               павялічыць узровень шматслоўнасьці\n"
-"  -q, --quiet, --silent       забараняць паказальнікі дасягненьняў\n"
+#~ msgid ""
+#~ "Found no .pot file in the current directory.\n"
+#~ "Please specify the input .pot file through the --input option.\n"
+#~ msgstr ""
+#~ "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
+#~ "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msgmerge.c:937
-msgid "this message should define plural forms"
-msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
+#~ msgid "fdopen() failed"
+#~ msgstr "fdopen() памылка"
 
-#: src/msgmerge.c:960
-msgid "this message should not define plural forms"
-msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
+#, c-format
+#~ msgid "%s subprocess I/O error"
+#~ msgstr "падпрацэс %s, памылка ўводу-вываду"
 
-#: src/msgmerge.c:1091
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr ""
-"%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
-"прапушчана %ld, састарэлых %ld.\n"
+#~ msgid "English translations for %s package"
+#~ msgstr "Беларускі пераклад для %s"
 
-#: src/msgmerge.c:1099
-msgid " done.\n"
-msgstr " зроблена.\n"
+#, c-format
+#~ msgid "two different charsets \"%s\" and \"%s\" in input file"
+#~ msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
 
-#: src/msgunfmt.c:226 src/msgunfmt.c:235
 #, c-format
-msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s і яўная назва файла ўзаема выключальны"
+#~ msgid ""
+#~ "input file `%s' doesn't contain a header entry with a charset "
+#~ "specification"
+#~ msgstr ""
+#~ "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
+#~ "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgunfmt.c:319
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
+#~ msgid "warning: "
+#~ msgstr "увага: "
 
-#: src/msgunfmt.c:324
-#, no-wrap
-msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
+#~ msgid "conversion failure"
+#~ msgstr "памылка пераўтварэньня"
 
-#: src/msgunfmt.c:334
-#, no-wrap
-msgid ""
-"Operation mode:\n"
-"  -j, --java               Java mode: input is a Java ResourceBundle class\n"
-"      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr ""
-"Рэжым дзеяньня:\n"
-"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
-"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
+#~ msgid ""
+#~ "input file doesn't contain a header entry with a charset specification"
+#~ msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgunfmt.c:341
 #, no-wrap
-msgid ""
-"Input file location:\n"
-"  FILE ...                 input .mo files\n"
-"If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"Файл уводу:\n"
-"  ФАЙЛ ...                 .mo файлы\n"
-"Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -q, --quiet, --silent       suppress progress indicators\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
+#~ "  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
+#~ "  -v, --verbose               павялічыць узровень шматслоўнасьці\n"
+#~ "  -q, --quiet, --silent       забараняць паказальнікі дасягненьняў\n"
 
-#: src/msgunfmt.c:348
-#, no-wrap
-msgid ""
-"Input file location in Java mode:\n"
-"  -r, --resource=RESOURCE  resource name\n"
-"  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-"The class name is determined by appending the locale name to the resource name,\n"
-"separated with an underscore.  The class is located using the CLASSPATH.\n"
-msgstr ""
+#~ msgid "this message should define plural forms"
+#~ msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgunfmt.c:357
-#, no-wrap
-msgid ""
-"Input file location in Tcl mode:\n"
-"  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-"  -d DIRECTORY             base directory of .msg message catalogs\n"
-"The -l and -d options are mandatory.  The .msg file is located in the\n"
-"specified directory.\n"
-msgstr ""
+#~ msgid "this message should not define plural forms"
+#~ msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgunfmt.c:366
-#, no-wrap
-msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE   write output to specified file\n"
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
-msgstr ""
+#, c-format
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
+#~ "прапушчана %ld, састарэлых %ld.\n"
+
+#~ msgid " done.\n"
+#~ msgstr " зроблена.\n"
+
+#, c-format
+#~ msgid "%s and explicit file names are mutually exclusive"
+#~ msgstr "%s і яўная назва файла ўзаема выключальны"
+
+#, no-wrap
+#~ msgid "Convert binary message catalog to Uniforum style .po file.\n"
+#~ msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java               Java mode: input is a Java ResourceBundle class\n"
+#~ "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "Рэжым дзеяньня:\n"
+#~ "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+#~ "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  FILE ...                 input .mo files\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  ФАЙЛ ...                 .mo файлы\n"
+#~ "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                           вывадзе (звычайна)\n"
+#~ "  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                           без дадатковых сімвалаў\n"
+#~ "      --force-po           запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent             запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --strict             запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                           пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
+#~ "      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+#~ "\n"
+#~ "                           даўжэй чым шырыня, на некалькі радкоў\n"
+#~ "  -s, --sort-output        ствараць упарадкаваны вывад\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -v, --verbose            increase verbosity level\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help               адлюстроўвае дапамогу й выходзіць\n"
+#~ "  -V, --version            выводзіць зьвесткі аб версіі й выходзіць\n"
+#~ "  -v, --verbose            павялічыць узровень шматслоўнасьці\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -d, --repeated                 print only duplicates\n"
+#~ "  -u, --unique                   print only unique messages, discard duplicates\n"
+#~ msgstr ""
+#~ "Выбар паведамленьня:\n"
+#~ "  -d, --repeated                 друкаваць толькі паўтараючыеся\n"
+#~ "  -u, --unique                   друкаваць толькі непаўторныя\n"
 
-#: src/msgunfmt.c:374
-#, no-wrap
-msgid ""
-"Output details:\n"
-"  -e, --no-escape          do not use C escapes in output (default)\n"
-"  -E, --escape             use C escapes in output, no extended chars\n"
-"      --force-po           write PO file even if empty\n"
-"  -i, --indent             write indented output style\n"
-"      --strict             write strict uniforum style\n"
-"  -w, --width=NUMBER       set output page width\n"
-"      --no-wrap            do not break long message lines, longer than\n"
-"                           the output page width, into several lines\n"
-"  -s, --sort-output        generate sorted output\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                           вывадзе (звычайна)\n"
-"  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
-"                           без дадатковых сімвалаў\n"
-"      --force-po           запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent             запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --strict             запісваць .po файл, жорстка адпавядаючы\n"
-"                           пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
-"      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-"\n"
-"                           даўжэй чым шырыня, на некалькі радкоў\n"
-"  -s, --sort-output        ствараць упарадкаваны вывад\n"
-
-#: src/msgunfmt.c:388
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help               display this help and exit\n"
-"  -V, --version            output version information and exit\n"
-"  -v, --verbose            increase verbosity level\n"
-msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help               адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version            выводзіць зьвесткі аб версіі й выходзіць\n"
-"  -v, --verbose            павялічыць узровень шматслоўнасьці\n"
-
-#: src/msguniq.c:284
-#, no-wrap
-msgid ""
-"Unifies duplicate translations in a translation catalog.\n"
-"Finds duplicate translations of the same message ID.  Such duplicates are\n"
-"invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
-"default, duplicates are merged together.  When using the --repeated option,\n"
-"only duplicates are output, and all other messages are discarded.  Comments\n"
-"and extracted comments will be cumulated, except that if --use-first is\n"
-"specified, they will be taken from the first translation.  File positions\n"
-"will be cumulated.  When using the --unique option, duplicates are discarded.\n"
-msgstr ""
+#~ msgid "<stdin>"
+#~ msgstr "<stdin>"
 
-#: src/msguniq.c:317
-#, no-wrap
-msgid ""
-"Message selection:\n"
-"  -d, --repeated                 print only duplicates\n"
-"  -u, --unique                   print only unique messages, discard duplicates\n"
-msgstr ""
-"Выбар паведамленьня:\n"
-"  -d, --repeated                 друкаваць толькі паўтараючыеся\n"
-"  -u, --unique                   друкаваць толькі непаўторныя\n"
-
-#: src/ngettext.c:215
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-
-#: src/ngettext.c:220
-#, no-wrap
-msgid ""
-"Display native language translation of a textual message whose grammatical\n"
-"form depends on a number.\n"
-msgstr ""
-"Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
-"граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
-
-#: src/ngettext.c:225
-#, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  COUNT                     choose singular/plural form based on this value\n"
-msgstr ""
-
-#: src/ngettext.c:236
-#, c-format, no-wrap
-msgid ""
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"Standard search directory: %s\n"
-msgstr ""
-"Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
-"асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
-"дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-"асяроддзя TEXTDOMAINDIR.\n"
-"Стандартная дырэкторыя для пошуку: %s\n"
-
-#: src/open-po.c:60
-msgid "<stdin>"
-msgstr "<stdin>"
-
-#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
-#: src/po-charset.c:337
 #, c-format
-msgid "%s: warning: "
-msgstr "%s: увага: "
+#~ msgid "%s: warning: "
+#~ msgstr "%s: увага: "
 
-#: src/po-charset.c:226
 #, c-format
-msgid ""
-"Charset \"%s\" is not a portable encoding name.\n"
-"Message conversion to user's charset might not work.\n"
-msgstr ""
-"Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
-"Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
+#~ msgid ""
+#~ "Charset \"%s\" is not a portable encoding name.\n"
+#~ "Message conversion to user's charset might not work.\n"
+#~ msgstr ""
+#~ "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
+#~ "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не "
+#~ "працаваць\n"
 
-#: src/po-charset.c:279 src/po-charset.c:309
-msgid "Continuing anyway, expect parse errors."
-msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
+#~ msgid "Continuing anyway, expect parse errors."
+#~ msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
 
-#: src/po-charset.c:281
-msgid "Continuing anyway."
-msgstr "Працяг выкананьня..."
+#~ msgid "Continuing anyway."
+#~ msgstr "Працяг выкананьня..."
 
-#: src/po-charset.c:284
 #, c-format
-msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv(),\n"
-"and iconv() does not support \"%s\".\n"
-msgstr ""
-"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
-"але iconv() не падтрымлівае \"%s\".\n"
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv(),\n"
+#~ "and iconv() does not support \"%s\".\n"
+#~ msgstr ""
+#~ "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
+#~ "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:293 src/po-charset.c:319
-msgid ""
-"Installing GNU libiconv and then reinstalling GNU gettext\n"
-"would fix this problem.\n"
-msgstr ""
-"Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
-"павінна выправіць гэту праблему.\n"
+#~ msgid ""
+#~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
+#~ "would fix this problem.\n"
+#~ msgstr ""
+#~ "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
+#~ "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
-msgid "%s\n"
-msgstr "%s\n"
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
 
-#: src/po-charset.c:312
 #, c-format
-msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv().\n"
-"This version was built without iconv().\n"
-msgstr ""
-"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
-"Гэта вэрсія пабудавана без iconv().\n"
-
-#: src/po-charset.c:338
-msgid ""
-"Charset missing in header.\n"
-"Message conversion to user's charset will not work.\n"
-msgstr ""
-"Прапушчан набор сімвалаў ў загалоўке.\n"
-"Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не будзе.\n"
+#~ msgid ""
+#~ "Charset \"%s\" is not supported. %s relies on iconv().\n"
+#~ "This version was built without iconv().\n"
+#~ msgstr ""
+#~ "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
+#~ "Гэта вэрсія пабудавана без iconv().\n"
 
-#: po-gram-gen.y:92
-msgid "inconsistent use of #~"
-msgstr "несумяшчальнае ўжываньне #~"
+#~ msgid ""
+#~ "Charset missing in header.\n"
+#~ "Message conversion to user's charset will not work.\n"
+#~ msgstr ""
+#~ "Прапушчан набор сімвалаў ў загалоўке.\n"
+#~ "Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не "
+#~ "будзе.\n"
 
-#: po-gram-gen.y:182
-msgid "missing `msgstr[]' section"
-msgstr "прапушчана секцыя \"msgstr[]\""
+#~ msgid "inconsistent use of #~"
+#~ msgstr "несумяшчальнае ўжываньне #~"
 
-#: po-gram-gen.y:190
-msgid "missing `msgid_plural' section"
-msgstr "прапушчана секцыя \"msgid_plural\""
+#~ msgid "missing `msgstr[]' section"
+#~ msgstr "прапушчана секцыя \"msgstr[]\""
 
-#: po-gram-gen.y:197
-msgid "missing `msgstr' section"
-msgstr "прапушчана секцыя \"msgstr\""
+#~ msgid "missing `msgid_plural' section"
+#~ msgstr "прапушчана секцыя \"msgid_plural\""
 
-#: po-gram-gen.y:242
-msgid "first plural form has nonzero index"
-msgstr "першая форма ліку мае ненулявы індэкс"
+#~ msgid "missing `msgstr' section"
+#~ msgstr "прапушчана секцыя \"msgstr\""
 
-#: po-gram-gen.y:244
-msgid "plural form has wrong index"
-msgstr "формы множнага ліку маюць дрэнныі індэкс"
+#~ msgid "first plural form has nonzero index"
+#~ msgstr "першая форма ліку мае ненулявы індэкс"
 
-#: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141
-#: src/po-lex.c:111 src/po-lex.c:144
-msgid "too many errors, aborting"
-msgstr "вельмі шмат памылак..."
+#~ msgid "plural form has wrong index"
+#~ msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
-msgid "invalid multibyte sequence"
-msgstr "нерэчаісная шматсімвальная паслядоўнасць"
+#~ msgid "too many errors, aborting"
+#~ msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:543
-msgid "incomplete multibyte sequence at end of file"
-msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
+#~ msgid "invalid multibyte sequence"
+#~ msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:553
-msgid "incomplete multibyte sequence at end of line"
-msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
+#~ msgid "incomplete multibyte sequence at end of file"
+#~ msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#: src/po-lex.c:561
-msgid "iconv failure"
-msgstr "памылка iconv"
+#~ msgid "incomplete multibyte sequence at end of line"
+#~ msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
-#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "памылка ў час чытаньня \"%s\""
+#~ msgid "iconv failure"
+#~ msgstr "памылка iconv"
 
-#: src/po-lex.c:825
 #, c-format
-msgid "keyword \"%s\" unknown"
-msgstr "невядомае ключавое слова \"%s\""
+#~ msgid "keyword \"%s\" unknown"
+#~ msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:935
-msgid "invalid control sequence"
-msgstr "нерэчаісная кантралюючая паслядоўнасць"
+#~ msgid "invalid control sequence"
+#~ msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:1043
-msgid "end-of-file within string"
-msgstr "сімвал канца файла знаходзіцца ўнутры радка"
+#~ msgid "end-of-file within string"
+#~ msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1049
-msgid "end-of-line within string"
-msgstr "сімвал канца радка знаходзіцца ўнутры радка"
+#~ msgid "end-of-line within string"
+#~ msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214
 #, c-format
-msgid "file \"%s\" is truncated"
-msgstr "файл \"%s\" абрэзан"
+#~ msgid "file \"%s\" is truncated"
+#~ msgstr "файл \"%s\" абрэзан"
 
-#: src/read-mo.c:143
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
+#~ msgid "file \"%s\" contains a not NUL terminated string"
+#~ msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
 
-#: src/read-mo.c:181 src/read-mo.c:289
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
-msgstr "фармат файла \"%s\" не GNU .mo"
+#~ msgid "file \"%s\" is not in GNU .mo format"
+#~ msgstr "фармат файла \"%s\" не GNU .mo"
 
-#: src/read-mo.c:194
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
+#~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
+#~ msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
-#: src/urlget.c:150
-msgid "expected two arguments"
-msgstr "чакалісь два аргумэнты"
+#~ msgid "expected two arguments"
+#~ msgstr "чакалісь два аргумэнты"
 
-#: src/urlget.c:169
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
-
-#: src/urlget.c:174
-#, 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 ""
+#~ msgid "Usage: %s [OPTION] URL FILE\n"
+#~ msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#: src/urlget.c:222
-msgid "error writing stdout"
-msgstr "памылка запісу ў stdout"
+#~ msgid "error writing stdout"
+#~ msgstr "памылка запісу ў stdout"
 
-#: src/write-java.c:1109
-msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
+#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
+#~ msgstr ""
+#~ "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: src/write-java.c:1119
 #, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr ""
-"немагчыма стварыць часовую дырэкторыю,\n"
-"выкарыстоўвываючы ўзор \"%s\""
+#~ msgid "cannot create a temporary directory using template \"%s\""
+#~ msgstr ""
+#~ "немагчыма стварыць часовую дырэкторыю,\n"
+#~ "выкарыстоўвываючы ўзор \"%s\""
 
-#: src/write-java.c:1132
 #, c-format
-msgid "not a valid Java class name: %s"
-msgstr "нерэчаісная назва Java-класа: %s"
+#~ msgid "not a valid Java class name: %s"
+#~ msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-java.c:1189 src/write-java.c:1202
 #, c-format
-msgid "failed to create \"%s\""
-msgstr "немагчыма стварыць \"%s\""
+#~ msgid "failed to create \"%s\""
+#~ msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
-msgid "error while writing \"%s\" file"
-msgstr "памылка ў час запісу файла \"%s\""
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "памылка ў час запісу файла \"%s\""
 
-#: src/write-java.c:1224
-msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-"ці ўсталяваць пераменную асяроддзя $JAVAC"
+#~ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+#~ msgstr ""
+#~ "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+#~ "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-mo.c:701
 #, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "памылка ў час адкрыцця \"%s\" для запісу"
+#~ msgid "error while opening \"%s\" for writing"
+#~ msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:415
 #, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-"
+#~ "пасьлядоўнасьці"
 
-#: src/write-po.c:783 src/write-po.c:877
 #, c-format
-msgid ""
-"The following msgid contains non-ASCII characters.\n"
-"This will cause problems to translators who use a character encoding\n"
-"different from yours. Consider using a pure ASCII msgid instead.\n"
-"%s\n"
-msgstr ""
-"Бягучы msgid зьмяшчае не ASCII сымбалі.\n"
-"Гэта будзе выклікаць складанасьці ў перакладчыкаў, якія выкарыстоўвываюць\n"
-"кадзіроўку, якая адрозьніваецца ад вашае. Разглядзіце магчымасьць\n"
-"выкарыстаньня толькі ASCII сымбаляў у msgid\n"
-"%s\n"
+#~ msgid ""
+#~ "The following msgid contains non-ASCII characters.\n"
+#~ "This will cause problems to translators who use a character encoding\n"
+#~ "different from yours. Consider using a pure ASCII msgid instead.\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Бягучы msgid зьмяшчае не ASCII сымбалі.\n"
+#~ "Гэта будзе выклікаць складанасьці ў перакладчыкаў, якія "
+#~ "выкарыстоўвываюць\n"
+#~ "кадзіроўку, якая адрозьніваецца ад вашае. Разглядзіце магчымасьць\n"
+#~ "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
+#~ "%s\n"
 
-#: src/write-po.c:944
 #, c-format
-msgid "cannot create output file \"%s\""
-msgstr "немагчыма стварыць файл вываду \"%s\""
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: src/write-po.c:951
 #, no-c-format
-msgid "standard output"
-msgstr "стандартны вывад"
+#~ msgid "standard output"
+#~ msgstr "стандартны вывад"
 
-#: src/x-c.c:954
 #, c-format
-msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
+#~ msgid "%s:%d: warning: unterminated character constant"
+#~ msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:978
 #, c-format
-msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: увага: незавершаны радок"
+#~ msgid "%s:%d: warning: unterminated string literal"
+#~ msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-po.c:106 src/xgettext.c:648
-msgid "this file may not contain domain directives"
-msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
+#~ msgid "this file may not contain domain directives"
+#~ msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
 
-#: src/x-rst.c:108
 #, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+#~ msgid "%s:%d: invalid string definition"
+#~ msgstr "%s:%d: нерэчаіснае вызначэньне радка"
 
-#: src/x-rst.c:168
 #, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: прапушчан нумар пасьля #"
+#~ msgid "%s:%d: missing number after #"
+#~ msgstr "%s:%d: прапушчан нумар пасьля #"
 
-#: src/x-rst.c:203
 #, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: нерэчаісны выраз-радок"
+#~ msgid "%s:%d: invalid string expression"
+#~ msgstr "%s:%d: нерэчаісны выраз-радок"
 
-#: src/xgettext.c:401
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
+#~ msgid "--join-existing cannot be used when output is written to stdout"
+#~ msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:406
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
+#~ msgid "xgettext cannot work without keywords to look for"
+#~ msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:502
 #, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
-msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
+#~ msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#~ msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:547
 #, no-wrap
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
+#~ msgid "Extract translatable strings from given input files.\n"
+#~ msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:552
 #, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-"Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
-"і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
-
-#: src/xgettext.c:567
-#, no-wrap
-msgid ""
-"Output file location:\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-"If output file is -, output is written to standard output.\n"
-msgstr ""
+#~ msgid ""
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "Similarly for optional arguments.\n"
+#~ msgstr ""
+#~ "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
+#~ "і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/xgettext.c:576
 #, no-wrap
-msgid ""
-"Choice of input file language:\n"
-"  -L, --language=NAME            recognise the specified language\n"
-"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
-"                                   EmacsLisp, librep, Java, awk, YCP, Tcl,\n"
-"                                   RST, Glade)\n"
-"  -C, --c++                      shorthand for --language=C++\n"
-"By default the language is guessed depending on the input file name extension.\n"
-msgstr ""
+#~ msgid ""
+#~ "Language=C/C++ specific options:\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "      --debug                    more detailed formatstring recognition result\n"
+#~ msgstr ""
+#~ "Асаблівасьці для C/C++:\n"
+#~ "  -a, --extract-all              атрымаць усе радкі\n"
+#~ "  -k, --keyword[=СЛОВА]          дадатковае ключавое слова для пошуку (бяз\n"
+#~ "                                 СЛОВА азначае не выкарыстоўваць неабумоўленыя\n"
+#~ "                                 ключавыя словы\n"
+#~ "  -T, --trigraphs                разумець ANSI C трыграфы пры ўводзе\n"
+#~ "      --debug                    больш падрабязны вынік разбору радка\n"
+#~ "                                 фарматаваньня\n"
 
-#: src/xgettext.c:587
-#, no-wrap
-msgid ""
-"Operation mode:\n"
-"  -j, --join-existing            join messages with existing file\n"
-"  -x, --exclude-file=FILE.po     entries from FILE.po are not extracted\n"
-"  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-"                                 preceding keyword lines) in output file\n"
-msgstr ""
-
-#: src/xgettext.c:596
-#, no-wrap
-msgid ""
-"Language=C/C++ specific options:\n"
-"  -a, --extract-all              extract all strings\n"
-"  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
-"                                 WORD means not to use default keywords)\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"      --debug                    more detailed formatstring recognition result\n"
-msgstr ""
-"Асаблівасьці для C/C++:\n"
-"  -a, --extract-all              атрымаць усе радкі\n"
-"  -k, --keyword[=СЛОВА]          дадатковае ключавое слова для пошуку (бяз\n"
-"                                 СЛОВА азначае не выкарыстоўваць неабумоўленыя\n"
-"                                 ключавыя словы\n"
-"  -T, --trigraphs                разумець ANSI C трыграфы пры ўводзе\n"
-"      --debug                    больш падрабязны вынік разбору радка\n"
-"                                 фарматаваньня\n"
-
-#: src/xgettext.c:606
 #, fuzzy, no-wrap
-msgid ""
-"Output details:\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"      --copyright-holder=STRING  set copyright holder in output\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape                не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць Сі ESC пасьлядоўнасьці ў\n"
-"                                 вывадзе, без дадатковых сымбаляў\n"
-"      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             вызначыць шырыню старонкі вываду\n"
-"      --no-wrap                  не разбураць доўгія радкі, даўжэйшыя за\n"
-"                                 шырыню старонкі вываду, на некалькі радкоў\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкаваць вывад па шляху да файла\n"
-"      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
-"      --copyright-holder=STRING  set copyright holder in output\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-
-#: src/xgettext.c:828
-msgid "standard input"
-msgstr "стандартны ўвод"
-
-#: src/xgettext.c:943
-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 ""
-"Пусты msgid.  Зарэзэрваваны GNU gettext:\n"
-"gettext(\"\") вяртае загаловак зь\n"
-"метададзенымі, а ня пусты радок.\n"
-
-#: src/xgettext.c:1299
-#, c-format
-msgid "language `%s' unknown"
-msgstr "невядомая мова `%s'"
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape                не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць Сі ESC пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе, без дадатковых сымбаляў\n"
+#~ "      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             вызначыць шырыню старонкі вываду\n"
+#~ "      --no-wrap                  не разбураць доўгія радкі, даўжэйшыя за\n"
+#~ "                                 шырыню старонкі вываду, на некалькі радкоў\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкаваць вывад па шляху да файла\n"
+#~ "      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+
+#~ 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 ""
+#~ "Пусты msgid.  Зарэзэрваваны GNU gettext:\n"
+#~ "gettext(\"\") вяртае загаловак зь\n"
+#~ "метададзенымі, а ня пусты радок.\n"
+
+#, c-format
+#~ msgid "language `%s' unknown"
+#~ msgstr "невядомая мова `%s'"
diff --git a/gettext-runtime/po/bg.po b/gettext-runtime/po/bg.po
index 60d88c68f..5c424e4fe 100644
--- 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.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-23 22:12+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -15,86 +15,71 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Неизвестна системна грешка"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмислена опция '%s', възможности:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: двусмислена опция '%s'\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опцията '--%s' е без аргументи\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: двусмислена опция '%s', възможности:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: непозната опция '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: опцията '--%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непозната опция '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непозната опция '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилна опция -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмислена опция '-W %s'\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опцията '-W %s' е без аргументи\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опцията '-W %s' изисква аргумент\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -103,7 +88,7 @@ msgstr ""
 "Това е свободен програмен продукт: свободни сте да го променяте и разпространя-\n"
 "вате.  Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
@@ -113,57 +98,57 @@ msgstr "Създадена от %s.\n"
 msgid "Bruno Haible"
 msgstr "Бруно Хаибле"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "твърде много аргументи"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "липсващи аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "За повече сведения, опитайте '%s --help'.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ОБВИВКА-ФОРМА]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Замества стойностите на променливите от обкръжението.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Режим на работа:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             извежда променливите намерени в ОБВИВКА-ФОРМА\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Осведомително извеждане:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               извеждане на сведение за версия и изход\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -180,7 +165,7 @@ msgstr ""
 "се заместват всички указани променливите от обкръжението намерени в стандартния\n"
 "вход.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -193,27 +178,27 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
 "а за грешки в превода на <dict@fsa-bg.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при четене \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "стандартен вход"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -222,33 +207,57 @@ msgstr ""
 "Употреба: %s [ОПЦИЯ] [[ОБЛАСТТЕКСТ] КЛЮЧ]\n"
 "или:      %s [ОПЦИЯ] -s [КЛЮЧ]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Извежда преведено текстово съобщение.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
-"  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
-"  -E                        (пренебрегва се, за съвместимост)\n"
-"  -h, --help                извеждане на тази помощ и изход\n"
-"  -n                        потискане на завършващ \"нов ред\"\n"
-"  -V, --version             извеждане на сведение за версия и изход\n"
-"  [ОБЛАСТТЕКСТ] КЛЮЧ        намиране на преведените съобщения съответни\n"
-"                            на КЛЮЧ от ОБЛАСТТЕКСТ\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               извеждане на сведение за версия и изход\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -269,40 +278,43 @@ msgstr ""
 "съобщенията, намерените в избрания каталог, се превеждат.\n"
 "Директория за търсене: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ОБЛАСТТЕКСТ] КЛЮЧ КЛЮЧ-МН.Ч. БРОЙ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Извежда превода на текстово съобщение, чиято граматична форма зависи от броя.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
-"  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
-"  -E                        (пренебрегва се, за съвместимост)\n"
-"  -h, --help                извеждане на тази помощ и изход\n"
-"  -V, --version             извеждане на сведение за версия и изход\n"
-"  [ОБЛАСТТЕКСТ]             намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
-"  КЛЮЧ КЛЮЧ-МН.Ч.           превежда КЛЮЧ (ед.ч.) / КЛЮЧ-МН.Ч (мн.ч.)\n"
-"  БРОЙ                      на базата на тази стойност избира формата за ед/мн.ч.\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -316,3 +328,63 @@ msgstr ""
 "обичайната директория, друго местоположение може да се зададе с променливата\n"
 "от обкръжението TEXTDOMAINDIR.\n"
 "Директория за търсене: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: опцията '--%s' е без аргументи\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: непозната опция '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: двусмислена опция '-W %s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: опцията '-W %s' е без аргументи\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: опцията '-W %s' изисква аргумент\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
+#~ "  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
+#~ "  -E                        (пренебрегва се, за съвместимост)\n"
+#~ "  -h, --help                извеждане на тази помощ и изход\n"
+#~ "  -n                        потискане на завършващ \"нов ред\"\n"
+#~ "  -V, --version             извеждане на сведение за версия и изход\n"
+#~ "  [ОБЛАСТТЕКСТ] КЛЮЧ        намиране на преведените съобщения съответни\n"
+#~ "                            на КЛЮЧ от ОБЛАСТТЕКСТ\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=ОБЛАСТТЕКСТ  намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
+#~ "  -e                        разрешава разгъване на някой \"заместващи последователности\"\n"
+#~ "  -E                        (пренебрегва се, за съвместимост)\n"
+#~ "  -h, --help                извеждане на тази помощ и изход\n"
+#~ "  -V, --version             извеждане на сведение за версия и изход\n"
+#~ "  [ОБЛАСТТЕКСТ]             намиране на преведените съобщения от ОБЛАСТТЕКСТ\n"
+#~ "  КЛЮЧ КЛЮЧ-МН.Ч.           превежда КЛЮЧ (ед.ч.) / КЛЮЧ-МН.Ч (мн.ч.)\n"
+#~ "  БРОЙ                      на базата на тази стойност избира формата за ед/мн.ч.\n"
diff --git a/gettext-runtime/po/ca.po b/gettext-runtime/po/ca.po
index 312dacd8c..750e27078 100644
--- a/gettext-runtime/po/ca.po
+++ b/gettext-runtime/po/ca.po
@@ -52,7 +52,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-24 18:49+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -60,6 +60,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
@@ -67,81 +68,65 @@ msgid "write error"
 msgstr "error d’escriptura"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: l’opció «%c%s» no és reconeguda\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «%c%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: l’opció «--%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: l’opció «--%s» no és reconeguda\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: l’opció «%c%s» no és reconeguda\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l’opció «-W %s» és ambígua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l’opció «-W %s» necessita un argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -150,7 +135,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
@@ -160,59 +145,59 @@ msgstr "Escrit per %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "manquen arguments"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
 
 # Molt més clar que l’original…  ivb
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [CADENA]…\n"
 
 # No és literal però queda més clar.  ivb
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substitueix variables d’entorn pels seus valors.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables      Mostra les variables que es troben a la CADENA.\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -229,7 +214,7 @@ msgstr ""
 "es substituiran totes les variables d’entorn que apareguen a l’entrada\n"
 "estàndard.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -242,26 +227,26 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "entrada estàndard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 # FIXME: The first syntax is badly described.  ivb
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -270,35 +255,56 @@ msgstr ""
 "Forma d’ús: %s [OPCIÓ] [DOMINI_TEXTUAL] IDMSG\n"
 "         o: %s [OPCIÓ] -s [IDMSG]…\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Mostra la traducció a idioma natiu d’un missatge textual.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMINI_TEXTUAL\n"
-"                       Obté del DOMINI_TEXTUAL els missatges traduïts.\n"
-"  -e                   Habilita l’expansió d’algunes seqüències d’escapada.\n"
-"  -E                   (No es té en compte, s’accepta per compatibilitat).\n"
-"  -h, --help           Mostra aquesta ajuda i ix.\n"
-"  -n                   Elimina el caràcter de nova línia final.\n"
-"  -V, --version        Mostra informació sobre la versió i ix.\n"
-"  [DOMINI_TEXTUAL] IDMSG\n"
-"                       Obté del DOMINI_TEXTUAL el missatge traduït\n"
-"                       corresponent a l’IDMSG.\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -319,12 +325,12 @@ msgstr ""
 "missatges que troba al catàleg seleccionat.\n"
 "Directori estàndard de cerca: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [DOMINI_TEXTUAL] IDMSG IDMSG_PLURAL NOMBRE\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -333,30 +339,31 @@ msgstr ""
 "Mostra la traducció a idioma natiu d’un missatge textual la forma gramatical\n"
 "del qual depén del nombre.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMINI_TEXTUAL\n"
-"                       Obté del DOMINI_TEXTUAL els missatges traduïts.\n"
-"  -e                   Habilita l’expansió d’algunes seqüències d’escapada.\n"
-"  -E                   (No es té en compte, s’accepta per compatibilitat.)\n"
-"  -h, --help           Mostra aquesta ajuda i ix.\n"
-"  -V, --version        Mostra informació sobre la versió i ix.\n"
-"  [DOMINI_TEXTUAL]     Obté del DOMINI_TEXTUAL el missatge traduït.\n"
-"  IDMSG IDMSG_PLURAL   Tradueix IDMSG (singular) / IDMSG_PLURAL (plural).\n"
-"  NOMBRE               Escull la forma singular o la plural basant‐se en\n"
-"                       aquest valor.\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -370,3 +377,67 @@ 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"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l’opció «--%s» no admet arguments\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: l’opció «--%s» no és reconeguda\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: l’opció «-W %s» és ambígua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: l’opció «-W %s» no admet arguments\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: l’opció «-W %s» necessita un argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINI_TEXTUAL\n"
+#~ "                       Obté del DOMINI_TEXTUAL els missatges traduïts.\n"
+#~ "  -e                   Habilita l’expansió d’algunes seqüències d’escapada.\n"
+#~ "  -E                   (No es té en compte, s’accepta per compatibilitat).\n"
+#~ "  -h, --help           Mostra aquesta ajuda i ix.\n"
+#~ "  -n                   Elimina el caràcter de nova línia final.\n"
+#~ "  -V, --version        Mostra informació sobre la versió i ix.\n"
+#~ "  [DOMINI_TEXTUAL] IDMSG\n"
+#~ "                       Obté del DOMINI_TEXTUAL el missatge traduït\n"
+#~ "                       corresponent a l’IDMSG.\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINI_TEXTUAL\n"
+#~ "                       Obté del DOMINI_TEXTUAL els missatges traduïts.\n"
+#~ "  -e                   Habilita l’expansió d’algunes seqüències d’escapada.\n"
+#~ "  -E                   (No es té en compte, s’accepta per compatibilitat.)\n"
+#~ "  -h, --help           Mostra aquesta ajuda i ix.\n"
+#~ "  -V, --version        Mostra informació sobre la versió i ix.\n"
+#~ "  [DOMINI_TEXTUAL]     Obté del DOMINI_TEXTUAL el missatge traduït.\n"
+#~ "  IDMSG IDMSG_PLURAL   Tradueix IDMSG (singular) / IDMSG_PLURAL (plural).\n"
+#~ "  NOMBRE               Escull la forma singular o la plural basant‐se en\n"
+#~ "                       aquest valor.\n"
diff --git a/gettext-runtime/po/cs.po b/gettext-runtime/po/cs.po
index c733d6ecc..0f191ab44 100644
--- a/gettext-runtime/po/cs.po
+++ b/gettext-runtime/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-26 08:34+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: gnulib-lib/closeout.c:66
@@ -25,94 +26,73 @@ msgid "write error"
 msgstr "chyba při zápisu"
 
 # lib/error.c:91
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Neznámá systémová chyba"
 
-# lib/getopt.c:628
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
-
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: přepínač „%s“ není jednoznačný\n"
 
-# lib/getopt.c:652
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:628
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
+
+# lib/getopt.c:707
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neznámý přepínač „%c%s“\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: přepínač „%s“ vyžaduje argument\n"
 
-# lib/getopt.c:703
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, 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:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neznámý přepínač „%c%s“\n"
-
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, 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:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, 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:964 gnulib-lib/getopt.c:980
-#, 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:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: přepínač „-W %s“ vyžaduje argument\n"
-
 # lib/xmalloc.c:82
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "paměť vyčerpána"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -123,7 +103,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napsal %s.\n"
@@ -134,60 +114,60 @@ msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
 # src/gettextp.c:164
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "příliš mnoho argumentů"
 
 # src/gettextp.c:154
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "chybí argumenty"
 
 # 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/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Více informací získáte příkazem „%s --help“.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Použití: %s [PŘEPÍNAČE] [FORMÁT_SHELLU]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Dosadí hodnoty proměnných prostředí.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Operační režim:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             vypsat proměnné vyskytující se ve FORMÁTU_SHELLU\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informační výstup:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobrazit tuto nápovědu a skončit\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               vypsat informace o verzi a skončit\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -204,7 +184,7 @@ msgstr ""
 "v opačném případě jsou dosazovány všechny odkazy na proměnné prostředí,\n"
 "které se objeví na standardním vstupu.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -220,27 +200,27 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Chyby hlaste na <bug-gnu-gettext@gnu.org>.\n"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba při čtení „%s“"
 
 # src/xget-lex.c:150
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standardní vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -249,35 +229,57 @@ msgstr ""
 "Použití: %s [PŘEPÍNAČE] [[TEXTOVÁ_DOMÉNA] ID_ZPRÁVY]\n"
 "nebo:    %s [PŘEPÍNAČE] -s [ID_ZPRÁVY]…\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Zobrazí v národním jazyce překlad textové zprávy.\n"
 
-# src/gettextp.c:233
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
-"  -e                            umožnit rozvoj některých sekvencí escape\n"
-"  -E                            (kvůli kompatibilitě, ignorován)\n"
-"  -h, --help                    vypsat tuto nápovědu a skončit\n"
-"  -n                            potlačit nové řádky na konci\n"
-"  -V, --version                 vypsat informace o verzi a skončit\n"
-"  [TEXTOVÁ_DOMÉNA] ID_ZPRÁVY    vypsat přeloženou zprávu odpovídající\n"
-"                                ID_ZPRÁVY z TEXTOVÉ_DOMÉNY\n"
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  zobrazit tuto nápovědu a skončit\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               vypsat informace o verzi a skončit\n"
 
 # src/gettextp.c:245
-#: src/gettext.c:265
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -298,44 +300,44 @@ msgstr ""
 "zprávy nalezené ve vybraném katalogu napřed přeloží. \n"
 "Standardní prohledávaná složka: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Použití: %s [PŘEPÍNAČE] [TEXTOVÁ_DOMÉNA] ID_ZPRÁVY ID_PLURÁLU_ZPRÁVY POČET\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Zobrazí v národním jazyce překlad textové zprávy, která gramaticky závisí na počtu.\n"
 
-# src/gettextp.c:233
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
-"  -e                            umožnit rozvoj některých sekvencí escape\n"
-"  -E                            (kvůli kompatibilitě, ignorován)\n"
-"  -h, --help                    vypsat tuto nápovědu a skončit\n"
-"  -n                            potlačit nové řádky na konci\n"
-"  -V, --version                 vypsat informace o verzi a skončit\n"
-"  [TEXTOVÁ_DOMÉNA]              překlady získat z TEXTOVÉ_DOMÉNY\n"
-"  ID_ZPRÁVY ID_PLURÁLU_ZPRÁVY   přeložit ID_ZPRÁVY (jednotné číslo) /\n"
-"                                ID_PLURÁLU_ZPRÁVY (množné číslo)\n"
-"  POČET                         zvolit jednotné/množné číslo podle této hodnoty\n"
 
 # src/gettextp.c:245
-#: src/ngettext.c:234
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -349,3 +351,72 @@ msgstr ""
 "v předpokládané složce, hledán se ve složce, zadané v proměnné prostředí\n"
 "TEXTDOMAINDIR.\n"
 "Standardní prohledávaná složka: %s\n"
+
+# lib/getopt.c:652
+#, 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:703
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: neznámý přepínač „--%s“\n"
+
+# lib/getopt.c:813
+#, 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
+#, 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
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: přepínač „-W %s“ vyžaduje argument\n"
+
+# src/gettextp.c:233
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
+#~ "  -e                            umožnit rozvoj některých sekvencí escape\n"
+#~ "  -E                            (kvůli kompatibilitě, ignorován)\n"
+#~ "  -h, --help                    vypsat tuto nápovědu a skončit\n"
+#~ "  -n                            potlačit nové řádky na konci\n"
+#~ "  -V, --version                 vypsat informace o verzi a skončit\n"
+#~ "  [TEXTOVÁ_DOMÉNA] ID_ZPRÁVY    vypsat přeloženou zprávu odpovídající\n"
+#~ "                                ID_ZPRÁVY z TEXTOVÉ_DOMÉNY\n"
+
+# src/gettextp.c:233
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTOVÁ_DOMÉNA   získat přeložené zprávy z TEXTOVÉ_DOMÉNY\n"
+#~ "  -e                            umožnit rozvoj některých sekvencí escape\n"
+#~ "  -E                            (kvůli kompatibilitě, ignorován)\n"
+#~ "  -h, --help                    vypsat tuto nápovědu a skončit\n"
+#~ "  -n                            potlačit nové řádky na konci\n"
+#~ "  -V, --version                 vypsat informace o verzi a skončit\n"
+#~ "  [TEXTOVÁ_DOMÉNA]              překlady získat z TEXTOVÉ_DOMÉNY\n"
+#~ "  ID_ZPRÁVY ID_PLURÁLU_ZPRÁVY   přeložit ID_ZPRÁVY (jednotné číslo) /\n"
+#~ "                                ID_PLURÁLU_ZPRÁVY (množné číslo)\n"
+#~ "  POČET                         zvolit jednotné/množné číslo podle této hodnoty\n"
diff --git a/gettext-runtime/po/da.po b/gettext-runtime/po/da.po
index 932a9729d..7dd34b8ef 100644
--- a/gettext-runtime/po/da.po
+++ b/gettext-runtime/po/da.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-04-26 01:45+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -26,76 +27,65 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefejl"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: tilvalget '-W %s' er flertydigt\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: tilvalget '%s' kan betyde flere ting, muligheder:"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, 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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: tilvalget `--%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukendt tilvalg `--%s'\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukendt tilvalg `%c%s'\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget '%c' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tilvalget '-W %s' er flertydigt\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, 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:1013 gnulib-lib/getopt.c:1031
-#, 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
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -104,7 +94,7 @@ msgstr ""
 "Dette er frit programmel: du kan frit �ndre og videredistribuere det.\n"
 "Der er INGEN GARANTIER, s� vidt som lov foreskriver.\n"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
@@ -114,57 +104,57 @@ msgstr "Skrevet af %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argumenter mangler"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Brug: %s [TILVALG] [SKAL-FORMAT]...\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Erstatter v�rdierne af milj�variable.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "K�rselstilstand:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             vis variablene der optr�der i SKAL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativt uddata:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                     vis denne hj�lp og afslut\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               vis versionsinformation og afslut\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -181,7 +171,7 @@ msgstr ""
 "ellers erstates alle milj�variabelreferencer der optr�der i\n"
 "standard-inddata.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -194,25 +184,25 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard-inddata"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -221,32 +211,56 @@ msgstr ""
 "Brug:  %s [TILVALG] [[TEKSTDOM�NE] TEKSTID]\n"
 "eller: %s [TILVALG] -s [TEKSTID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Vis ikke-engelsk overs�ttelse af en tekstbesked.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
-"  -e                        aktiv�r fortolkning af visse escape-sekvenser\n"
-"  -E                        (ignoreret af hensyn til kompatibilitet)\n"
-"  -h, --help                vis denne hj�lp og afslut\n"
-"  -V, --version             vis versionsinformation og afslut\n"
-"  [TEKSTDOM�NE] TEKSTID     hent den oversatte tekst svarende til\n"
-"                            TEKSTID fra TEKSTDOM�NE\n"
-
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                     vis denne hj�lp og afslut\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               vis versionsinformation og afslut\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -267,12 +281,12 @@ msgstr ""
 "overs�ttes de tekster der findes i det valgte tekstkatalog.\n"
 "Standard-filkataloget for s�gning er: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Brug: %s [TILVALG] [TEKSTDOM�NE] TEKSTID TEKSTID-FLERTAL ANTAL\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -281,28 +295,31 @@ msgstr ""
 "Vis overs�ttelser i det lokale sprog af tekstbeskeder hvis grammatiske\n"
 "form beror p� et tal.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
-"  -e                        aktiv�r fortolkning af visse escape-sekvenser\n"
-"  -E                        (ignoreret af hensyn til kompatibilitet)\n"
-"  -h, --help                vis denne hj�lp og afslut\n"
-"  -V, --version             vis versionsinformation og afslut\n"
-"  [TEKSTDOM�NE]             hent den oversatte tekst fra TEKSTDOM�NE\n"
-"  TEKSTID TEKSTID-FLERTAL   overs�t TEKSTID (ental) / TEKSTID-FLERTAL (flertal)\n"
-"  COUNT                     v�lg ental/flertalsform ud fra denne v�rdi\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -316,3 +333,58 @@ msgstr ""
 "s�dvanlige filkatalog, kan en anden placering angives vha milj�variablen\n"
 "TEXTDOMAINDIR.\n"
 "Standard-filkataloget for s�gning er: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ukendt tilvalg `--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: tilvalget `%s' kr�ver et argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
+#~ "  -e                        aktiv�r fortolkning af visse escape-sekvenser\n"
+#~ "  -E                        (ignoreret af hensyn til kompatibilitet)\n"
+#~ "  -h, --help                vis denne hj�lp og afslut\n"
+#~ "  -V, --version             vis versionsinformation og afslut\n"
+#~ "  [TEKSTDOM�NE] TEKSTID     hent den oversatte tekst svarende til\n"
+#~ "                            TEKSTID fra TEKSTDOM�NE\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOM�NE  hent oversatte tekster fra TEKSTDOM�NE\n"
+#~ "  -e                        aktiv�r fortolkning af visse escape-sekvenser\n"
+#~ "  -E                        (ignoreret af hensyn til kompatibilitet)\n"
+#~ "  -h, --help                vis denne hj�lp og afslut\n"
+#~ "  -V, --version             vis versionsinformation og afslut\n"
+#~ "  [TEKSTDOM�NE]             hent den oversatte tekst fra TEKSTDOM�NE\n"
+#~ "  TEKSTID TEKSTID-FLERTAL   overs�t TEKSTID (ental) / TEKSTID-FLERTAL (flertal)\n"
+#~ "  COUNT                     v�lg ental/flertalsform ud fra denne v�rdi\n"
diff --git a/gettext-runtime/po/de.po b/gettext-runtime/po/de.po
index 2e85fe9c2..365a55303 100644
--- a/gettext-runtime/po/de.po
+++ b/gettext-runtime/po/de.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-25 12:17+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -87,87 +87,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: Option „%s“ ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: Option »--%s« erwartet kein Argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unbekannte Option »%c%s«\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: Option »--%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unbekannte Option »--%s«\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unbekannte Option »%c%s«\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- »%c«\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erwartet ein Argument -- »%c«\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option »-W %s« erwartet ein Argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "virtueller Speicher aufgebraucht"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -178,7 +163,7 @@ msgstr ""
 "weiterzugeben.\n"
 "Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -188,57 +173,57 @@ msgstr "Geschrieben von %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "Argumente fehlen"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Aufruf: %s [OPTION] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Werte der Umgebungsvariablen substituieren.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables              Variablen ausgeben, die im SHELL-FORMAT vorkommen\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -255,7 +240,7 @@ msgstr ""
 "referenziert, substituiert; andernfalls werden alle Referenzen auf\n"
 "Umgebungsvariablen bei der Standardausgabe substituiert.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -269,7 +254,7 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -277,21 +262,21 @@ msgstr ""
 "Für die deutsche Übersetzung sind die Übersetzer der Mailingliste\n"
 "<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "Standardeingabe"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -301,33 +286,56 @@ msgstr ""
 "oder:   %s [OPTION] -s [SCHLÜSSEL]...\n"
 
 # CHECKIT
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Übersetzung einer textuellen Meldung in einer nativen Sprache anzeigen.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTBEREICH   Übersetzungen aus TEXTBEREICH anfordern\n"
-"  -e                         einige Escape-Sequenzen expandieren\n"
-"  -E                         (aus Kompatibilitätsgründen ignoriert)\n"
-"  -h, --help                 diese Hilfe anzeigen und beenden\n"
-"  -n                         kein abschließendes Zeilenendezeichen ausgeben\n"
-"  -V, --version              Versionsnummer anzeigen und beenden\n"
-"  [TEXTBEREICH] SCHLÜSSEL    die Übersetzung zu SCHLÜSSEL aus TEXTBEREICH\n"
-"                               anfordern\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -350,13 +358,13 @@ msgstr ""
 "\n"
 "Standardverzeichnis: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Aufruf: %s [OPTION] [TEXTBEREICH] SCHLÜSSEL SCHLÜSSEL-PLURAL ZAHL\n"
 
 # CHECKIT
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -365,30 +373,31 @@ msgstr ""
 "Übersetzung einer textuellen Meldung, deren grammatische Form von einer Zahl\n"
 "abhängt, in einer nativen Sprache anzeigen.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTBEREICH     Übersetzungen aus TEXTBEREICH holen\n"
-"  -e                           einige Escape-Sequenzen expandieren\n"
-"  -E                           (aus Kompatibilitätsgründen ignoriert)\n"
-"  -h, --help                   diese Hilfe anzeigen und beenden\n"
-"  -V, --version                Versionsnummer anzeigen und beenden\n"
-"  [TEXTBEREICH]                die Übersetzung aus dem TEXTBEREICH holen\n"
-"  SCHLÜSSEL SCHLÜSSEL-PLURAL   SCHLÜSSEL (Singular) / SCHLÜSSEL-PLURAL (Plural)\n"
-"                                 übersetzen\n"
-"  ZAHL                         Singular-/Pluralform anhand des Wertes ZAHL\n"
-"                                 wählen\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -404,5 +413,67 @@ msgstr ""
 "\n"
 "Standardverzeichnis: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »--%s« erwartet kein Argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: unbekannte Option »--%s«\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »-W %s« erwartet kein Argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: Option »-W %s« erwartet ein Argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTBEREICH   Übersetzungen aus TEXTBEREICH anfordern\n"
+#~ "  -e                         einige Escape-Sequenzen expandieren\n"
+#~ "  -E                         (aus Kompatibilitätsgründen ignoriert)\n"
+#~ "  -h, --help                 diese Hilfe anzeigen und beenden\n"
+#~ "  -n                         kein abschließendes Zeilenendezeichen ausgeben\n"
+#~ "  -V, --version              Versionsnummer anzeigen und beenden\n"
+#~ "  [TEXTBEREICH] SCHLÜSSEL    die Übersetzung zu SCHLÜSSEL aus TEXTBEREICH\n"
+#~ "                               anfordern\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTBEREICH     Übersetzungen aus TEXTBEREICH holen\n"
+#~ "  -e                           einige Escape-Sequenzen expandieren\n"
+#~ "  -E                           (aus Kompatibilitätsgründen ignoriert)\n"
+#~ "  -h, --help                   diese Hilfe anzeigen und beenden\n"
+#~ "  -V, --version                Versionsnummer anzeigen und beenden\n"
+#~ "  [TEXTBEREICH]                die Übersetzung aus dem TEXTBEREICH holen\n"
+#~ "  SCHLÜSSEL SCHLÜSSEL-PLURAL   SCHLÜSSEL (Singular) / SCHLÜSSEL-PLURAL (Plural)\n"
+#~ "                                 übersetzen\n"
+#~ "  ZAHL                         Singular-/Pluralform anhand des Wertes ZAHL\n"
+#~ "                                 wählen\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 a6d8170eb..8dd8068c2 100644
--- a/gettext-runtime/po/el.po
+++ b/gettext-runtime/po/el.po
@@ -6,7 +6,7 @@ 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: 2019-04-13 11:21+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"
@@ -14,6 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
@@ -21,95 +22,76 @@ msgid "write error"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%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"
-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"
-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"
-msgstr "%s: � ������� `%s' ������� ���������\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: �� ������������ ������� `--%s'\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: �� ������������ ������� `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: �� ������������ ������� `%c%s'\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: � ������� `%s' ������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+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"
-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"
-msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
-
-#
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ����� �����������"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
 #, 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"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�������� ��� ���/��� %s.\n"
@@ -120,59 +102,60 @@ msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "���� ����� ��������"
 
 #
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "������������ ��������"
 
 #
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������������ �����������.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr ""
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr ""
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr ""
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +166,7 @@ msgid ""
 "standard input are substituted.\n"
 msgstr ""
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -195,72 +178,90 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "������� �������� ��������� ��� <bug-gnu-utils@gnu.org>.\n"
 
 #
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
 #
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "�������� �������"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr ""
 
-#
-#: src/gettext.c:253
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:263
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"�����: %s [�������] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   �������� ������������� ��������� ��� �� TEXTDOMAIN\n"
-"  -e                        ������������ ��� ����������� ��������� ������\n"
-"                              ���������� ��������\n"
-"  -E                        (��������� ��� ������ ������������)\n"
-"  -h, --help                �������� ����� ��� �������� ��� ������\n"
-"  -n                        ������� ��������� ������� ������� ��� ����� ��� ������\n"
-"  -v, --version             �������� ����������� ������� ��� ������\n"
-"  [TEXTDOMAIN] MSGID        �������� ����������� ������������� ��������� ��� �����������\n"
-"                            ��� MSGID ��� �� TEXTDOMAIN\n"
-
-#
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, c-format
+msgid "  -h, --help                display this help and exit\n"
+msgstr ""
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, c-format
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+
+#
+#: src/gettext.c:285
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -274,44 +275,44 @@ msgstr ""
 "��������, �� �������� ��� ���������� ��� ���������� ��������, �������������.\n"
 "������������ ��������� ����������: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr ""
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
 
-#
-#: src/ngettext.c:222
-#, fuzzy, c-format, no-wrap
+#: src/ngettext.c:228
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"�����: %s [�������] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   �������� ������������� ��������� ��� �� TEXTDOMAIN\n"
-"  -e                        ������������ ��� ����������� ��������� ������\n"
-"                              ���������� ��������\n"
-"  -E                        (��������� ��� ������ ������������)\n"
-"  -h, --help                �������� ����� ��� �������� ��� ������\n"
-"  -n                        ������� ��������� ������� ������� ��� ����� ��� ������\n"
-"  -v, --version             �������� ����������� ������� ��� ������\n"
-"  [TEXTDOMAIN] MSGID        �������� ����������� ������������� ��������� ��� �����������\n"
-"                            ��� MSGID ��� �� TEXTDOMAIN\n"
-
-#
-#: src/ngettext.c:233
+
+#
+#: src/ngettext.c:251
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -330,6 +331,77 @@ msgstr ""
 "������������ ��������� ����������: %s\n"
 
 #
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: � ������� `--%s' ��� ��������� ���������\n"
+
+#
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: �� ������������ ������� `--%s'\n"
+
+#
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: �� �������� ������� -- %c\n"
+
+#
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: � ������� `-W %s' ����� �����������\n"
+
+#
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
+
+#
+#, fuzzy, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "�����: %s [�������] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTDOMAIN   �������� ������������� ��������� ��� �� TEXTDOMAIN\n"
+#~ "  -e                        ������������ ��� ����������� ��������� ������\n"
+#~ "                              ���������� ��������\n"
+#~ "  -E                        (��������� ��� ������ ������������)\n"
+#~ "  -h, --help                �������� ����� ��� �������� ��� ������\n"
+#~ "  -n                        ������� ��������� ������� ������� ��� ����� ��� ������\n"
+#~ "  -v, --version             �������� ����������� ������� ��� ������\n"
+#~ "  [TEXTDOMAIN] MSGID        �������� ����������� ������������� ��������� ��� �����������\n"
+#~ "                            ��� MSGID ��� �� TEXTDOMAIN\n"
+
+#
+#, fuzzy, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "�����: %s [�������] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTDOMAIN   �������� ������������� ��������� ��� �� TEXTDOMAIN\n"
+#~ "  -e                        ������������ ��� ����������� ��������� ������\n"
+#~ "                              ���������� ��������\n"
+#~ "  -E                        (��������� ��� ������ ������������)\n"
+#~ "  -h, --help                �������� ����� ��� �������� ��� ������\n"
+#~ "  -n                        ������� ��������� ������� ������� ��� ����� ��� ������\n"
+#~ "  -v, --version             �������� ����������� ������� ��� ������\n"
+#~ "  [TEXTDOMAIN] MSGID        �������� ����������� ������������� ��������� ��� �����������\n"
+#~ "                            ��� MSGID ��� �� TEXTDOMAIN\n"
+
+#
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1567,8 +1639,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 6d708f62f..72a9ab320 100644
--- a/gettext-runtime/po/eo.po
+++ b/gettext-runtime/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-02-22 18:47-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -17,87 +17,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "skriberaro"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la modifilo '%s' estas plursenca; ebloj:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: la modifilo '%s' estas plursenca\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '--%s' ne prenas argumenton\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: la modifilo '%s' estas plursenca; ebloj:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nerekonata modifilo '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: la modifilo '%c%s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: la modifilo '%s' bezonas argumenton\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nerekonata modifilo '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nerekonata modifilo '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nevalida modifilo -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la modifilo bezonas argumenton -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la modifilo '-W %s' estas plursenca\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '-W %s' ne prenas argumenton\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la modifilo '-W %s' bezonas argumenton\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "memoro elĉerpita"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,7 +91,7 @@ msgstr ""
 "Ĉi tio estas libera programo; vi estas libera ŝanĝi kaj redistribui ĝin.\n"
 "Estas NENIA GARANTIO, ĝis la grado leĝe permesata.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Verkita de %s.\n"
@@ -116,57 +101,57 @@ msgstr "Verkita de %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "tro da argumentoj"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argumentoj mankas"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Uzado: %s [MODIFILO] [ŜEL-FORMATO]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substituas la valorojn de mediaj variabloj.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Funkcia reĝimo:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             eligi la variablojn aperantajn en ŜEL-FORMATO\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informa eligo:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  montri ĉi tiun helpon kaj eligi\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               eligi informon pri la versio kaj eliri\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +168,7 @@ msgstr ""
 "substituataj; alia ĉiuj referencoj al mediaj variabloj aperantaj en la\n"
 "normala enigo estas substituataj.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -197,25 +182,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raportu cimojn al <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eraro dum legado de \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "normala enigo"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -224,33 +209,56 @@ msgstr ""
 "Uzado: %s [MODIFILO] [[TEXTDOMAIN] MSGID]\n"
 "aŭ:    %s [MODIFILO] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Montru lokalingvan tradukon de teksta mesaĝo.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        ŝalti tradukadon de iuj eskapokodoj\n"
-"  -E                        (ignorata pro kongrueco)\n"
-"  -h, --help                montri ĉi tiun helpon kaj eliri\n"
-"  -n                        ne eligi finan linifinon\n"
-"  -V, --version             montri informon pri la versio kaj eliri\n"
-"  [TEXTDOMAIN] MSGID        trovi tradukitan mesaĝon, kiu respondas al\n"
-"                            MSGID el TEXTDOMAIN\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  montri ĉi tiun helpon kaj eligi\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               eligi informon pri la versio kaj eliri\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -270,12 +278,12 @@ msgstr ""
 "anstataŭe, tiuj mesaĝoj trovitaj en la elektita katalogo estas tradukataj.\n"
 "Normala serĉdosierujo: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uzado: %s [MODIFILO] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,28 +292,31 @@ msgstr ""
 "Montri lokalingvan tradukon de teksta mesaĝo, kies gramatika formo\n"
 "dependas de nombro.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   trovi tradukitan mesaĝon el TEXTDOMAIN\n"
-"  -e                        ŝalti tradukadon de iuj eskapokodoj\n"
-"  -E                        (ignorata pro kongrueco)\n"
-"  -h, --help                montri ĉi tiun helpon kaj eliri\n"
-"  -V, --version             montri informon pri la versio kaj eliri\n"
-"  [TEXTDOMAIN]              trovi tradukitan mesaĝon el TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        traduki MSGID (singulare) / MSGID-PLURAL (plurale)\n"
-"  COUNT                     elekti singularon/pluralon per ĉi tiu valoro\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -319,5 +330,65 @@ msgstr ""
 "alia dosierujo povas esti specifita per la media variablo TEXTDOMAINDIR.\n"
 "Normala serĉdosierujo: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la modifilo '--%s' ne prenas argumenton\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: nerekonata modifilo '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: la modifilo '-W %s' estas plursenca\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: la modifilo '-W %s' ne prenas argumenton\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: la modifilo '-W %s' bezonas argumenton\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        ŝalti tradukadon de iuj eskapokodoj\n"
+#~ "  -E                        (ignorata pro kongrueco)\n"
+#~ "  -h, --help                montri ĉi tiun helpon kaj eliri\n"
+#~ "  -n                        ne eligi finan linifinon\n"
+#~ "  -V, --version             montri informon pri la versio kaj eliri\n"
+#~ "  [TEXTDOMAIN] MSGID        trovi tradukitan mesaĝon, kiu respondas al\n"
+#~ "                            MSGID el TEXTDOMAIN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   trovi tradukitan mesaĝon el TEXTDOMAIN\n"
+#~ "  -e                        ŝalti tradukadon de iuj eskapokodoj\n"
+#~ "  -E                        (ignorata pro kongrueco)\n"
+#~ "  -h, --help                montri ĉi tiun helpon kaj eliri\n"
+#~ "  -V, --version             montri informon pri la versio kaj eliri\n"
+#~ "  [TEXTDOMAIN]              trovi tradukitan mesaĝon el TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        traduki MSGID (singulare) / MSGID-PLURAL (plurale)\n"
+#~ "  COUNT                     elekti singularon/pluralon per ĉi tiu valoro\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nepermesata modifilo -- %c\n"
diff --git a/gettext-runtime/po/es.po b/gettext-runtime/po/es.po
index 793cc0210..aae4db53e 100644
--- a/gettext-runtime/po/es.po
+++ b/gettext-runtime/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-23 22:53+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
@@ -24,81 +25,65 @@ 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:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Hay un error desconocido del sistema"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: la opción '%s' es ambigua; posibilidades:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción no válida -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la opción requiere un argumento -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opción '-W %s' requiere un argumento\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -107,7 +92,7 @@ msgstr ""
 "Esto es software libre: puede modificarlo y redistribuirlo libremente.\n"
 "SIN NINGÚN TIPO DE GARANTÍA, dentro de los límites legales.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -117,59 +102,59 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pruebe '%s --help' para más información.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FORMATO-DEL-INTÉRPRETE-DE-COMANDOS]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Sustituye los valores de las variables de entorno.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr ""
 " -v, --variables                    muestra las variables que aparecen en el\n"
 "                                    FORMATO-DE-INTÉRPRETE-DE-COMANDOS\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra este texto de ayuda y finaliza\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -188,7 +173,7 @@ msgstr ""
 "todas las referencias a las variables de entorno existentes en la\n"
 "entrada estándar, son sustituidas.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -202,25 +187,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar defectos a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error mientras se lee \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -229,49 +214,58 @@ msgstr ""
 "Modo de empleo: %s [OPCIÓN] [[DOMINIOTEXTO] MSGID]\n"
 "             o: %s [OPCIÓN] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Mostrar la traducción a idioma nativo de un mensaje textual.\n"
 
-# ¿ Y qué te parece informa de la versión y finaliza ?
-# así es cómo lo estoy haciendo en todas las textutils. em
-# No he movido nada porque dudo un poco. Creo que en un
-# msdos de IBM en español decía muestra la versión y por
-# eso lo traduje así. Si encuentro la referencia te informo
-# pero por ahora no me convence eso de `informa de la versión'
-# suena demasiado pomposo. mm
-#
-# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
-#
-# Prefiero que se quede como está, pues aunque se repite muestra,
-# es en otra opción en donde aparece. mm
-#
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
-"  -e                        habilita la expansión de algunas secuencias\n"
-"                            de escape\n"
-"  -E                        (existe por compatibilidad, no tiene efecto)\n"
-"  -h, --help                muestra este texto de ayuda y finaliza\n"
-"  -n                        suprime el carácter de nueva línea\n"
-"  -V, --version             informa de la versión y finaliza\n"
-"  [DOMINIOTEXTO] MSGID      obtiene el mensaje traducido correspondiente\n"
-"                            al MSGID del DOMINIOTEXTO\n"
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  muestra este texto de ayuda y finaliza\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               muestra la versión y finaliza\n"
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
 # no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/gettext.c:265
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -293,12 +287,12 @@ msgstr ""
 "encuentre dentro del catálogo seleccionado.\n"
 "Directorio de búsqueda estándar: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [DOMINIODETEXTO] MSGID MSG-PLURAL CUENTA\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -307,45 +301,33 @@ msgstr ""
 "Muestra la traducción del idioma nativo de un mensaje textual cuya forma\n"
 "gramatical depende de un número.\n"
 
-# ¿ Y qué te parece informa de la versión y finaliza ?
-# así es cómo lo estoy haciendo en todas las textutils. em
-# No he movido nada porque dudo un poco. Creo que en un
-# msdos de IBM en español decía muestra la versión y por
-# eso lo traduje así. Si encuentro la referencia te informo
-# pero por ahora no me convence eso de `informa de la versión'
-# suena demasiado pomposo. mm
-#
-# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
-#
-# Prefiero que se quede como está, pues aunque se repite muestra,
-# es en otra opción en donde aparece. mm
-#
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
-"  -e                        habilita la expansión de algunas secuencias\n"
-"                            de escape\n"
-"  -E                        (existe por compatibilidad, no tiene efecto)\n"
-"  -h, --help                muestra este texto de ayuda y finaliza\n"
-"  -V, --version             informa de la versión y finaliza\n"
-"  [DOMINIOTEXTO]            obtiene el mensaje traducido del DOMINIOTEXTO\n"
-"  MSGID MSGID-PLURAL        traduce el MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  CUENTA                    selecciona la forma singular/plural con base\n"
-"                            en este valor\n"
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
 # no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/ngettext.c:234
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -359,3 +341,92 @@ msgstr ""
 "el directorio predeterminado, con la variable de entorno TEXTDOMAINDIR se\n"
 "puede especificar otro lugar.\n"
 "Directorio de búsqueda estándar: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción '--%s' no admite ningún argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opción no reconocida '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: la opción '-W %s' es ambigua\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: la opción '-W %s' requiere un argumento\n"
+
+# ¿ Y qué te parece informa de la versión y finaliza ?
+# así es cómo lo estoy haciendo en todas las textutils. em
+# No he movido nada porque dudo un poco. Creo que en un
+# msdos de IBM en español decía muestra la versión y por
+# eso lo traduje así. Si encuentro la referencia te informo
+# pero por ahora no me convence eso de `informa de la versión'
+# suena demasiado pomposo. mm
+#
+# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
+#
+# Prefiero que se quede como está, pues aunque se repite muestra,
+# es en otra opción en donde aparece. mm
+#
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
+#~ "  -e                        habilita la expansión de algunas secuencias\n"
+#~ "                            de escape\n"
+#~ "  -E                        (existe por compatibilidad, no tiene efecto)\n"
+#~ "  -h, --help                muestra este texto de ayuda y finaliza\n"
+#~ "  -n                        suprime el carácter de nueva línea\n"
+#~ "  -V, --version             informa de la versión y finaliza\n"
+#~ "  [DOMINIOTEXTO] MSGID      obtiene el mensaje traducido correspondiente\n"
+#~ "                            al MSGID del DOMINIOTEXTO\n"
+
+# ¿ Y qué te parece informa de la versión y finaliza ?
+# así es cómo lo estoy haciendo en todas las textutils. em
+# No he movido nada porque dudo un poco. Creo que en un
+# msdos de IBM en español decía muestra la versión y por
+# eso lo traduje así. Si encuentro la referencia te informo
+# pero por ahora no me convence eso de `informa de la versión'
+# suena demasiado pomposo. mm
+#
+# Ok, como te parezca, es más que nada por no repetir 'muestra' em+
+#
+# Prefiero que se quede como está, pues aunque se repite muestra,
+# es en otra opción en donde aparece. mm
+#
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIOTEXTO obtiene los mensajes traducidos de DOMINIOTEXTO\n"
+#~ "  -e                        habilita la expansión de algunas secuencias\n"
+#~ "                            de escape\n"
+#~ "  -E                        (existe por compatibilidad, no tiene efecto)\n"
+#~ "  -h, --help                muestra este texto de ayuda y finaliza\n"
+#~ "  -V, --version             informa de la versión y finaliza\n"
+#~ "  [DOMINIOTEXTO]            obtiene el mensaje traducido del DOMINIOTEXTO\n"
+#~ "  MSGID MSGID-PLURAL        traduce el MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  CUENTA                    selecciona la forma singular/plural con base\n"
+#~ "                            en este valor\n"
diff --git a/gettext-runtime/po/et.po b/gettext-runtime/po/et.po
index 55e27fa15..a3b070a2f 100644
--- a/gettext-runtime/po/et.po
+++ b/gettext-runtime/po/et.po
@@ -5,7 +5,7 @@ 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: 2019-04-13 11:21+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"
@@ -13,88 +13,74 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%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"
-msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: v�ti `%s' on mitmet�henduslik\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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tundmatu v�ti `%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%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"
-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"
-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:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+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"
-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"
-msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "m�lu sai otsa"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
 #, 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"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
@@ -104,57 +90,58 @@ msgstr "Selle programmi on kirjutanud %s.\n"
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argumendid on puudu"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "T�iendava info saamiseks proovi `%s --help'.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr ""
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr ""
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr ""
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -165,7 +152,7 @@ msgid ""
 "standard input are substituted.\n"
 msgstr ""
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -176,70 +163,87 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standardsisend"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr ""
 
-#: src/gettext.c:253
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:263
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"Kasutamine: %s [V�TI] [[[TEKSTIPIIRKOND] STRID] | [-s [STRID]...]]\n"
-"  -d, --domain=TEKSTIPIIRKOND   v�tab t�lgitud stringid sellest piirkonnast\n"
-"  -e                            lubab erim�rkide kasutamise\n"
-"  -E                            (eiratakse, kasutusel �hilduvuse p�rast)\n"
-"  -h, --help                    v�ljastab k�esoleva abiinfo ja l�petab\n"
-"                                programmi t��\n"
-"  -n                            eemaldab rel�purunnused\n"
-"  -V, --version                 v�ljastab versiooniinfo ja l�petab programmi\n"
-"                                t��\n"
-"  [TEKSTIPIIRKOND] STRID        v�tab ainult t�lgitud stringid, mis asuvad\n"
-"                                m��ratud piirkonnas ja omavad identifikaatorit\n"
-"                                STRID\n"
-
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, c-format
+msgid "  -h, --help                display this help and exit\n"
+msgstr ""
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, c-format
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+
+#: src/gettext.c:285
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -255,45 +259,43 @@ msgstr ""
 "found in the selected catalog are translated.!!!\n"
 "Standardne otsinukataloog: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr ""
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
 
-#: src/ngettext.c:222
-#, fuzzy, c-format, no-wrap
+#: src/ngettext.c:228
+#, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"Kasutamine: %s [V�TI] [TEKSTIPIIRKOND] STRID STRID-MITMUS ARV\n"
-"  -d, --domain=TEKSTIPIIRKOND   v�tab t�lgitud stringid sellest piirkonnast\n"
-"  -e                            lubab erim�rkide kasutamise\n"
-"  -E                            (eiratakse, kasutusel �hilduvuse p�rast)\n"
-"  -h, --help                    v�ljastab k�esoleva abiinfo ja l�petab\n"
-"                                programmi t��\n"
-"  -n                            eemaldab real�putunnused\n"
-"  -V, --version                 v�ljastab versiooniinfo ja l�petab programmi\n"
-"                                t��\n"
-"  [TEKSTIPIIRKOND]              v�tab ainult t�lgitud stringid, mis asuvad\n"
-"                                m��ratud piirkonnas\n"
-"  STRID STRID-MITMUS            t�lgib STRID (ainsus) / STRID-MITMUS (mitmus)\n"
-"  ARV                           valib ainsuse/mitmuse vormi sellele arvule\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -309,6 +311,75 @@ msgstr ""
 "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n"
 "Standardne otsinukataloog: %s\n"
 
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: tundmatu v�ti `--%s'\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: lubamatu v�ti -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: v�ti `-W %s' on mitmet�henduslik\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
+
+#, fuzzy, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "Kasutamine: %s [V�TI] [[[TEKSTIPIIRKOND] STRID] | [-s [STRID]...]]\n"
+#~ "  -d, --domain=TEKSTIPIIRKOND   v�tab t�lgitud stringid sellest piirkonnast\n"
+#~ "  -e                            lubab erim�rkide kasutamise\n"
+#~ "  -E                            (eiratakse, kasutusel �hilduvuse p�rast)\n"
+#~ "  -h, --help                    v�ljastab k�esoleva abiinfo ja l�petab\n"
+#~ "                                programmi t��\n"
+#~ "  -n                            eemaldab rel�purunnused\n"
+#~ "  -V, --version                 v�ljastab versiooniinfo ja l�petab programmi\n"
+#~ "                                t��\n"
+#~ "  [TEKSTIPIIRKOND] STRID        v�tab ainult t�lgitud stringid, mis asuvad\n"
+#~ "                                m��ratud piirkonnas ja omavad identifikaatorit\n"
+#~ "                                STRID\n"
+
+#, fuzzy, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "Kasutamine: %s [V�TI] [TEKSTIPIIRKOND] STRID STRID-MITMUS ARV\n"
+#~ "  -d, --domain=TEKSTIPIIRKOND   v�tab t�lgitud stringid sellest piirkonnast\n"
+#~ "  -e                            lubab erim�rkide kasutamise\n"
+#~ "  -E                            (eiratakse, kasutusel �hilduvuse p�rast)\n"
+#~ "  -h, --help                    v�ljastab k�esoleva abiinfo ja l�petab\n"
+#~ "                                programmi t��\n"
+#~ "  -n                            eemaldab real�putunnused\n"
+#~ "  -V, --version                 v�ljastab versiooniinfo ja l�petab programmi\n"
+#~ "                                t��\n"
+#~ "  [TEKSTIPIIRKOND]              v�tab ainult t�lgitud stringid, mis asuvad\n"
+#~ "                                m��ratud piirkonnas\n"
+#~ "  STRID STRID-MITMUS            t�lgib STRID (ainsus) / STRID-MITMUS (mitmus)\n"
+#~ "  ARV                           valib ainsuse/mitmuse vormi sellele arvule\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1087,8 +1158,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"
@@ -1454,8 +1525,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 12dfe0c4f..73722f46c 100644
--- a/gettext-runtime/po/fi.po
+++ b/gettext-runtime/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-09-01 18:46+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -17,88 +17,73 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "virhe kirjoitettaessa"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ on moniselitteinen; mahdollisuudet:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: valitsin ’%s’ on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valitsin ’%s’ on moniselitteinen; mahdollisuudet:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin -- ’%c’\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppui"
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -107,7 +92,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Tekijä: %s\n"
@@ -117,57 +102,57 @@ msgstr "Tekijä: %s\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "ei riittävästi argumentteja"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Yritä ’%s --help’ saadaksesi lisää tietoja.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Käyttö: %s [VALITSIN] [SHELL-MUOTO]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Korvaa ympäristömuuttujien arvot.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät muuttujat\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tulosta tämä ohje ja poistu\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                tulosta ohjelman versiotiedot ja poistu\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -184,7 +169,7 @@ msgstr ""
 "SHELL-MUODOssa. Muussa tapauksessa kaikki vakiosyötteessä esiintyvät\n"
 "ympäristömuuttujat korvataan.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -198,29 +183,31 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
-"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
-"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
+"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
+"org>.\n"
+"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists."
+"sourceforge.net>.\n"
 
 # ainoa mahdollinen %s tällä hetkellä on alla oleva "standard input"
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa ”%s”"
 
 # [sic]
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "vakiosyötettä"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -229,34 +216,57 @@ msgstr ""
 "Käyttö: %s [VALITSIN] [[KÄÄNNÖSJOUKKO] VIESTI-ID]\n"
 "tai:    %s [VALITSIN] -s [VIESTI-ID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
-"  -e                        salli joidenkin lainauskoodien laajentaminen\n"
-"  -E                        (jätetään huomiotta yhteensopivuuden vuoksi)\n"
-"  -h, --help                näytä tämä ohje ja poistu\n"
-"  -n                        jättää pois rivinvaihdon rivin lopusta\n"
-"  -V, --version             näyttää ohjelmiston versiotiedot ja lopettaa\n"
-"                            suorituksen\n"
-"  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-ID:tä\n"
-"                            KÄÄNNÖSJOUKOSSA\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  tulosta tämä ohje ja poistu\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version                tulosta ohjelman versiotiedot ja poistu\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -277,12 +287,12 @@ msgstr ""
 "valitusta viestiluettelosta löydetyt viestit näytetään käännettyinä.\n"
 "Perushakemisto, josta haku suoritetaan: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -291,28 +301,31 @@ msgstr ""
 "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille, jonka muoto\n"
 "riippuu lukuarvosta.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
-"  -e                        salli joidenkin lainauskoodien laajentaminen\n"
-"  -h, --help                näytä tämä ohje ja poistu\n"
-"  -V, --version             näytä versiotiedot ja poistu\n"
-"  [KÄÄNNÖSJOUKKO]           hae käännetty sanoma KÄÄNNÖSJOUKOSTA\n"
-"  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON (monikko)\n"
-"  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
-"                              perusteella\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -327,5 +340,66 @@ msgstr ""
 "jalla TEXTDOMAINDIR.\n"
 "Perushakemisto, josta haku suoritetaan: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: tunnistamaton valitsin ’--%s’\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
+#~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
+#~ "  -E                        (jätetään huomiotta yhteensopivuuden vuoksi)\n"
+#~ "  -h, --help                näytä tämä ohje ja poistu\n"
+#~ "  -n                        jättää pois rivinvaihdon rivin lopusta\n"
+#~ "  -V, --version             näyttää ohjelmiston versiotiedot ja lopettaa\n"
+#~ "                            suorituksen\n"
+#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-ID:tä\n"
+#~ "                            KÄÄNNÖSJOUKOSSA\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
+#~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
+#~ "  -h, --help                näytä tämä ohje ja poistu\n"
+#~ "  -V, --version             näytä versiotiedot ja poistu\n"
+#~ "  [KÄÄNNÖSJOUKKO]           hae käännetty sanoma KÄÄNNÖSJOUKOSTA\n"
+#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON (monikko)\n"
+#~ "  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
+#~ "                              perusteella\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 2d7a9a982..60ea51a49 100644
--- a/gettext-runtime/po/fr.po
+++ b/gettext-runtime/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-12-22 23:57+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -20,87 +20,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s : l'option « %s » est ambiguë ; choix possibles :"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s : l'option « %s » est ambiguë ; choix possibles :"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s : l'option « %c%s » n'est pas connue\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s : l'option « --%s » exige un argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s : l'option « --%s » n'est pas connue\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s : l'option « %c%s » n'est pas connue\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : option non valable -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option exige un argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s : l'option « -W %s » est ambiguë\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s : l'option « -W %s » exige un argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -109,7 +94,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
@@ -119,57 +104,57 @@ msgstr "Écrit par %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "arguments manquants"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Usage : %s [OPTION] [FORMAT-SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substituer les valeurs des variables d'environnement.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             afficher les variables apparaissant dans FORMAT-SHELL\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  affiche l'aide-mémoire\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               affiche le nom et la version du logiciel\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -186,7 +171,7 @@ msgstr ""
 "remplacées; sinon toutes les variables d'environnement apparaissant dans\n"
 "l'entrée standard sont remplacées.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -199,25 +184,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportez tout problème fonctionnel à <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erreur lors de la lecture de « %s »"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "entrée standard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -226,32 +211,57 @@ msgstr ""
 "Usage : %s [OPTION] [[DOMAINE] MSGID]\n"
 "ou     %s [OPTION] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Afficher la traduction en langage natif d'un message textuel.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMAINE   récupère les traductions depuis le DOMAINE\n"
-"  -e                     remplace certaines séquences d'échappement\n"
-"  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
-"  -h, --help             affiche ce message d'aide\n"
-"  -n                     supprime le caractère de fin de ligne\n"
-"  -V, --version          affiche le numéro de version du programme\n"
-"  [DOMAINE] MSGID        récupère la traduction de MSGID, depuis le DOMAINE\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  affiche l'aide-mémoire\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               affiche le nom et la version du logiciel\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -273,12 +283,12 @@ msgstr ""
 "\n"
 "Dossier standard de recherche : %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Usage : %s [OPTION] [DOMAINE] MSGID MSGID-PLURIEL VALEUR\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -287,28 +297,31 @@ msgstr ""
 "Afficher la traduction en langue native d'un message textuel dont\n"
 "la forme grammaticale dépend d'un nombre\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMAINE   récupère la traduction dans le DOMAINE donné\n"
-"  -e                     remplace certaines séquences d'échappement\n"
-"  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
-"  -h, --help             affiche ce message d'aide\n"
-"  -V, --version          affiche la version du programme\n"
-"  [DOMAINE]              récupère la traduction dans le DOMAINE\n"
-"  MSGID MSGID-PLURAL     traduit le MSGID (singulier) / MSGID-PLURAL (pluriel)\n"
-"  VALEUR                 choisit la forme singulier/pluriel selon la VALEUR\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -322,3 +335,62 @@ msgstr ""
 "habituel, la variable d'environnement TEXTDOMAINDIR peut indiquer un autre\n"
 "dossier.\n"
 "Répertoire standard de recherche : %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s : l'option « --%s » n'est pas connue\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s : l'option « -W %s » est ambiguë\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s : l'option « -W %s » exige un argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMAINE   récupère les traductions depuis le DOMAINE\n"
+#~ "  -e                     remplace certaines séquences d'échappement\n"
+#~ "  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
+#~ "  -h, --help             affiche ce message d'aide\n"
+#~ "  -n                     supprime le caractère de fin de ligne\n"
+#~ "  -V, --version          affiche le numéro de version du programme\n"
+#~ "  [DOMAINE] MSGID        récupère la traduction de MSGID, depuis le DOMAINE\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMAINE   récupère la traduction dans le DOMAINE donné\n"
+#~ "  -e                     remplace certaines séquences d'échappement\n"
+#~ "  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
+#~ "  -h, --help             affiche ce message d'aide\n"
+#~ "  -V, --version          affiche la version du programme\n"
+#~ "  [DOMAINE]              récupère la traduction dans le DOMAINE\n"
+#~ "  MSGID MSGID-PLURAL     traduit le MSGID (singulier) / MSGID-PLURAL (pluriel)\n"
+#~ "  VALEUR                 choisit la forme singulier/pluriel selon la VALEUR\n"
diff --git a/gettext-runtime/po/ga.po b/gettext-runtime/po/ga.po
index f5b14eb24..094e8c479 100644
--- a/gettext-runtime/po/ga.po
+++ b/gettext-runtime/po/ga.po
@@ -1,104 +1,93 @@
 # Irish translations for gettext-runtime.
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext-runtime package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2005, 2006, 2007.
+# This file is distributed under the same license as the gettext package.
+# Kevin Patrick Scannell <kscanne@gmail.com>, 2005, 2006, 2007, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-07 23:09+0200\n"
-"PO-Revision-Date: 2007-10-14 12:15-0500\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-01-10 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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "earr�id sa scr�obh"
+msgstr "earráid sa scríobh"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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"
-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"
-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"
-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"
-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"
-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"
-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"
-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"
-msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha -- %c\n"
-
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+msgstr "Earráid chórais anaithnid"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: Tá an rogha '%s' débhríoch\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Tá an rogha '%s' débhríoch: féidearthachtaí:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: rogha anaithnid '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '--%s'\n"
+
+#: gnulib-lib/getopt.c:621
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: T� an rogha `-W %s' d�bhr�och\n"
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: rogha neamhbhailí -- '%c'\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, 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"
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- '%c'\n"
 
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
-msgstr "cuimhne �dithe"
-
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+msgstr "cuimhne ídithe"
+
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright � %s Free Software Foundation, Inc.\n"
-"Cead�nas GPLv3+: GNU GPL, leagan 3 n� n�os nua� <http://gnu.org/licenses/gpl.html>\n"
-"Is saorbhogearra � seo: ceada�tear duit � a athr� agus a athdh�ileadh.\n"
-"N�l bar�nta AR BITH ann, an oiread at� ceadaithe de r�ir dl�.\n"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Ceadúnas GPLv3+: GNU GPL, leagan 3 nó níos nuaí <http://gnu.org/licenses/gpl.html>\n"
+"Is saorbhogearra é seo: ceadaítear duit é a athrú agus a athdháileadh.\n"
+"Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Le %s.\n"
@@ -108,57 +97,57 @@ msgstr "Le %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
-msgstr "an iomarca arg�int�"
+msgstr "an iomarca argóintí"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
-msgstr "arg�int� ar iarraidh"
+msgstr "argóintí ar iarraidh"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fh�il.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Bain triail as '%s --help' chun tuilleadh eolais a fháil.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "�s�id: %s [ROGHA] [FORM�ID-BHLAOISCE]\n"
+msgstr "Úsáid: %s [ROGHA] [FORMÁID-BHLAOISCE]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "Ionadaigh na luachanna d'athr�ga timpeallachta.\n"
+msgstr "Ionadaigh na luachanna d'athróga timpeallachta.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "M�d oibre:\n"
+msgstr "Mód oibre:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             aschuir na hathr�ga at� san FHORM�ID-BHLAOISCE\n"
+msgstr "  -v, --variables             aschuir na hathróga atá san FHORMÁID-BHLAOISCE\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Aschur faisn�iseach:\n"
+msgstr "Aschur faisnéiseach:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  taispe�in an chabhair seo agus scoir\n"
+msgstr "  -h, --help                  taispeáin an chabhair seo agus scoir\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               taispe�in eolas faoin leagan agus scoir\n"
+msgstr "  -V, --version               taispeáin eolas faoin leagan agus scoir\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -168,136 +157,163 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"Sa ghn�thmh�d, c�ipe�il ionchur caighde�nach go haschur caighde�nach, le\n"
-"tagairt� d'athr�ga timpeallachta san fhoirm $ATHR�G n� ${ATHR�G}\n"
-"ionadaithe lena luachanna.  M� t� FORM�ID-BHLAOISCE sonraithe,\n"
-"n� hionadaigh ach na hathr�ga timpeallachta at� san FHORM�ID-BHLAOISCE;\n"
-"i ngach c�s eile, ionadaigh gach uile athr�g thimpeallachta san ionchur\n"
-"caighde�nach.\n"
-
-#: src/envsubst.c:211
+"Sa ghnáthmhód, cóipeáil ionchur caighdeánach go haschur caighdeánach, le\n"
+"tagairtí d'athróga timpeallachta san fhoirm $ATHRÓG nó ${ATHRÓG}\n"
+"ionadaithe lena luachanna.  Má tá FORMÁID-BHLAOISCE sonraithe,\n"
+"ná hionadaigh ach na hathróga timpeallachta atá san FHORMÁID-BHLAOISCE;\n"
+"i ngach cás eile, ionadaigh gach uile athróg thimpeallachta san ionchur\n"
+"caighdeánach.\n"
+
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
-"Le --variables, d�an neamhaird den ionchur caighde�nach, agus taispe�in na\n"
-"hathr�ga timpeallachta at� san FHORM�ID-BHLAOISCE, ceann sa l�ne.\n"
+"Le --variables, déan neamhaird den ionchur caighdeánach, agus taispeáin na\n"
+"hathróga timpeallachta atá san FHORMÁID-BHLAOISCE, ceann sa líne.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Seol tuairisc� fabhtanna chuig <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Seol tuairiscí fabhtanna chuig <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "earr�id agus \"%s\" � l�amh"
+msgstr "earráid agus \"%s\" á léamh"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
-msgstr "ionchur caighde�nach"
+msgstr "ionchur caighdeánach"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"�s�id: %s [ROGHA] [[FEARANN] MSGID]\n"
-"n�:    %s [ROGHA] -s [MSGID]...\n"
+"Úsáid: %s [ROGHA] [[FEARANN] MSGID]\n"
+"nó:    %s [ROGHA] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Taispe�in an t-aistri�ch�n de theachtaireacht sa teanga dh�chais.\n"
+msgstr "Taispeáin an t-aistriúchán de theachtaireacht sa teanga dhúchais.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=FEARANN      faigh teachtaireachta� aistrithe �n FHEARANN\n"
-"  -e                        fairsing roinnt seichimh �al�ch�in\n"
-"  -E                        (gan feidhm, comhoiri�nacht)\n"
-"  -h, --help                taispe�in an chabhair seo agus scoir\n"
-"  -n                        n� taispe�in l�ne nua foirceanta\n"
-"  -V, --version             taispe�in eolas faoin leagan agus scoir\n"
-"  [TEXTDOMAIN] MSGID        faigh an teachtaireacht aistrithe comhfhreagrach\n"
-"                            leis an MSGID �n FHEARANN\n"
-
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  taispeáin an chabhair seo agus scoir\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               taispeáin eolas faoin leagan agus scoir\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Mura bhfuil an paraim�adar FEARANN sonraithe, cinntear an fearann de r�ir na\n"
-"hathr�ige timpeallachta TEXTDOMAIN.  Mura n-aims�tear catal�g na\n"
-"dteachtaireachta� sa ghn�thchomhadlann, is f�idir comhadlann eile a shocr�\n"
-"tr� �s�id na hathr�ige timpeallachta TEXTDOMAINDIR.\n"
-"Leis an rogha -s, is cos�il leis an ord� `echo',\n"
-"ach in ionad na harg�int� a ch�ipe�il go stdout gan athr�, aistr�onn s� na\n"
-"teachtaireachta� at� aimsithe sa chatal�g roghnaithe.\n"
-"Gn�thchomhadlann chuardaigh: %s\n"
-
-#: src/ngettext.c:212
+"Mura bhfuil an paraiméadar FEARANN ann, faightear an fearann ón\n"
+"athróg timpeallachta TEXTDOMAIN.  Mura n-aimsítear catalóg na\n"
+"dteachtaireachtaí sa ghnáthchomhadlann, is féidir comhadlann eile a shocrú\n"
+"trí úsáid na hathróige timpeallachta TEXTDOMAINDIR.\n"
+"Leis an rogha -s, feidhmíonn sé cosúil leis an ordú 'echo',\n"
+"ach in ionad na hargóintí a chóipeáil go stdout gan athrú, aistríonn sé na\n"
+"teachtaireachtaí a aimsíonn sé sa chatalóg roghnaithe.\n"
+"Gnáthchomhadlann chuardaigh: %s\n"
+
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "�s�id: %s [ROGHA] [FEARANN] MSGID MSGID-PLURAL L�ON\n"
+msgstr "Úsáid: %s [ROGHA] [FEARANN] MSGID MSGID-PLURAL LÍON\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Taispe�in an t-aistri�ch�n sa teanga dh�chais de theachtaireacht\n"
-"a bhfuil a foirm ghramadach sple�ch ar uimhir.\n"
+"Taispeáin an t-aistriúchán sa teanga dhúchais de theachtaireacht\n"
+"a bhfuil a foirm ghramadach spleách ar uimhir.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=FEARANN      faigh teachtaireachta� aistrithe �n FHEARANN\n"
-"  -e                        fairsing roinnt seichimh �al�ch�in\n"
-"  -E                        (gan feidhm, comhoiri�nacht)\n"
-"  -h, --help                taispe�in an chabhair seo agus scoir\n"
-"  -V, --version             taispe�in eolas faoin leagan agus scoir\n"
-"  [FEARANN]                 faigh teachtaireachta� aistrithe �n FHEARANN\n"
-"  MSGID MSGID-PLURAL        aistrigh MSGID (uatha) / MSGID-PLURAL (iolra)\n"
-"  L�ON                      roghnaigh uatha/iolra de r�ir an luacha seo\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -306,18 +322,83 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Mura bhfuil an paraim�adar FEARANN sonraithe, cinntear an fearann de r�ir na\n"
-"hathr�ige timpeallachta TEXTDOMAIN.  Mura n-aims�tear catal�g na\n"
-"dteachtaireachta� sa ghn�thchomhadlann, is f�idir comhadlann eile a shocr�\n"
-"tr� �s�id na hathr�ige timpeallachta TEXTDOMAINDIR.\n"
-"Gn�thchomhadlann chuardaigh: %s\n"
+"Mura bhfuil an paraiméadar FEARANN sonraithe, cinntear an fearann de réir na\n"
+"hathróige timpeallachta TEXTDOMAIN.  Mura n-aimsítear catalóg na\n"
+"dteachtaireachtaí sa ghnáthchomhadlann, is féidir comhadlann eile a shocrú\n"
+"trí úsáid na hathróige timpeallachta TEXTDOMAINDIR.\n"
+"Gnáthchomhadlann chuardaigh: %s\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: rogha anaithnid '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: Tá an rogha '-W %s' débhríoch\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '-W %s'\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=FEARANN      faigh teachtaireachtaí aistrithe ón FHEARANN\n"
+#~ "  -e                        fairsing roinnt seichimh éalúcháin\n"
+#~ "  -E                        (gan feidhm, comhoiriúnacht)\n"
+#~ "  -h, --help                taispeáin an chabhair seo agus scoir\n"
+#~ "  -n                        ná taispeáin líne nua foirceanta\n"
+#~ "  -V, --version             taispeáin eolas faoin leagan agus scoir\n"
+#~ "  [TEXTDOMAIN] MSGID        faigh an teachtaireacht aistrithe comhfhreagrach\n"
+#~ "                            leis an MSGID ón FHEARANN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=FEARANN      faigh teachtaireachtaí aistrithe ón FHEARANN\n"
+#~ "  -e                        fairsing roinnt seichimh éalúcháin\n"
+#~ "  -E                        (gan feidhm, comhoiriúnacht)\n"
+#~ "  -h, --help                taispeáin an chabhair seo agus scoir\n"
+#~ "  -V, --version             taispeáin eolas faoin leagan agus scoir\n"
+#~ "  [FEARANN]                 faigh teachtaireachtaí aistrithe ón FHEARANN\n"
+#~ "  MSGID MSGID-PLURAL        aistrigh MSGID (uatha) / MSGID-PLURAL (iolra)\n"
+#~ "  LÍON                      roghnaigh uatha/iolra de réir an luacha seo\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
-#~ "Copyright � %s Free Software Foundation, Inc.\n"
-#~ "Is saorbhogearra an r�omhchl�r seo; f�ach ar an bhunch�d le haghaidh\n"
-#~ "coinn�ollacha c�ipe�la.  N�l bar�nta ar bith ann; go fi� n�l bar�nta ann\n"
-#~ "d'IND�OLTACHT n� FEILI�NACHT D'FHEIDHM AR LEITH.\n"
+#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "Is saorbhogearra an ríomhchlár seo; féach ar an bhunchód le haghaidh\n"
+#~ "coinníollacha cóipeála.  Níl baránta ar bith ann; go fiú níl baránta ann\n"
+#~ "d'INDÍOLTACHT nó FEILIÚNACHT D'FHEIDHM AR LEITH.\n"
diff --git a/gettext-runtime/po/gl.po b/gettext-runtime/po/gl.po
index 4ed66a7a8..7bb93329f 100644
--- a/gettext-runtime/po/gl.po
+++ b/gettext-runtime/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-09-09 16:05+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -28,81 +29,65 @@ msgstr ""
 msgid "write error"
 msgstr "erro de escritura"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: a opción «%s» é ambigua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opción «%c%s» non recoñecida\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: a opción «%c%s» non permite un argumento\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: a opción «--%s» require un argumento\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción «--%s» non recoñecida\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción «%c%s» non recoñecida\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción incorrecta -- «%c»\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a opción require un argumento -- «%c»\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opción «-W %s» é ambigua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a opción «-W %s» non permite un argumento\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opción «-W %s» require un argumento\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -111,7 +96,7 @@ msgstr ""
 "Isto é software libre: ten a liberdade para cambialo e redistribuílo.\n"
 "Non hai GARANTÍAS, ata onde o permita a lei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -121,57 +106,57 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Use «%s --help» para obter máis información.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Modo de uso: %s [OPCIÓN] [FORMATO-SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substitúe os valores das variábeis de ambiente.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Modo de funcionamento:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             escribe na saída as variábeis atopadas en FORMATO-SHELL\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               Mostra a información da versión e sae\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -188,7 +173,7 @@ msgstr ""
 "substitúense todas as referencias a variábeis que se atopen na entrada\n"
 "estándar.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -201,25 +186,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -228,34 +213,56 @@ msgstr ""
 "Uso:   %s [OPCIÓN] [[DOMINIO] MSGID]\n"
 "ou:    %s [OPCIÓN] -s [MSGID]...]\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Mostra a tradución nun idioma dunha mensaxe de texto.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMINIO      obter as mensaxes traducidas do DOMINIO\n"
-"  -e                        permitir a expansión de algunhas secuencias\n"
-"                            de escape\n"
-"  -E                        (ignorado por compatibilidade)\n"
-"  -h, --help                mostrar esta axuda e saír\n"
-"  -n                        suprimir o carácter final de nova liña\n"
-"  -V, --version             mostrar a información da versión e saír\n"
-"  [DOMINIO] MSGID           obter a mensaxe traducida correspondente a\n"
-"                            MSGID do DOMINIO\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               Mostra a información da versión e sae\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -276,40 +283,43 @@ msgstr ""
 "no catálogo escollido.\n"
 "Directorio estándar de busca: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPCIÓN] [DOMINIO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Mostra a tradución a un idioma dunha mensaxe de texto cuxa forma gramatical depende dun número.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMINIO      obter a mensaxe traducida do DOMINIO\n"
-"  -e                        permitir a expansión de algunhas secuencias de escape\n"
-"  -E                        (ignorada por compatibilidade)\n"
-"  -h, --help                mostrar esta axuda e saír\n"
-"  -V, --version             mostrar a información da versión e saír\n"
-"  [DOMINIO]                 obter a mensaxe traducida do DOMINIO\n"
-"  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  NÚMERO                    escoller a forma singular/plural segundo este valor\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -324,16 +334,80 @@ msgstr ""
 "ambiente TEXTDOMAINDIR.\n"
 "Directorio estándar de busca: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opción «--%s» non permite ningún argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opción «--%s» non recoñecida\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: a opción «-W %s» é ambigua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: a opción «-W %s» non permite un argumento\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opción «-W %s» require un argumento\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIO      obter as mensaxes traducidas do DOMINIO\n"
+#~ "  -e                        permitir a expansión de algunhas secuencias\n"
+#~ "                            de escape\n"
+#~ "  -E                        (ignorado por compatibilidade)\n"
+#~ "  -h, --help                mostrar esta axuda e saír\n"
+#~ "  -n                        suprimir o carácter final de nova liña\n"
+#~ "  -V, --version             mostrar a información da versión e saír\n"
+#~ "  [DOMINIO] MSGID           obter a mensaxe traducida correspondente a\n"
+#~ "                            MSGID do DOMINIO\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIO      obter a mensaxe traducida do DOMINIO\n"
+#~ "  -e                        permitir a expansión de algunhas secuencias de escape\n"
+#~ "  -E                        (ignorada por compatibilidade)\n"
+#~ "  -h, --help                mostrar esta axuda e saír\n"
+#~ "  -V, --version             mostrar a información da versión e saír\n"
+#~ "  [DOMINIO]                 obter a mensaxe traducida do DOMINIO\n"
+#~ "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  NÚMERO                    escoller a forma singular/plural segundo este valor\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Isto é software libre; vexa o código para as condicións de copia.  NON hai\n"
+#~ "Isto é software libre; vexa o código para as condicións de copia.  NON "
+#~ "hai\n"
 #~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
 #~ "FIN DETERMINADO.\n"
 
@@ -346,7 +420,8 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -h, --help                  display this help and exit\n"
 #~ "  -V, --version               output version information and exit\n"
 #~ "\n"
@@ -358,19 +433,25 @@ msgstr ""
 #~ "cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] def.po ref.po\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obligatorios para\n"
+#~ "Os argumentos obrigatorios para as opcións longas son tamén obligatorios "
+#~ "para\n"
 #~ "as opcións curtas.\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de ficheiros\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "ficheiros\n"
 #~ "                              de entrada\n"
 #~ "  -h, --help                  amosar esta axuda e saír\n"
 #~ "  -V, --version               amosa-la información da versión e saír\n"
 #~ "\n"
 #~ "Compara dous ficheiros .po de estilo Uniforum para verificar que os dous\n"
-#~ "conteñen o mesmo conxunto de cadeas msgid.  O ficheiro def.po é un ficheiro\n"
+#~ "conteñen o mesmo conxunto de cadeas msgid.  O ficheiro def.po é un "
+#~ "ficheiro\n"
 #~ "PO existente, coas traduccións antigas.  O ficheiro ref.po é o último\n"
-#~ "ficheiro PO creado (xeralmente por xgettext).  Isto é útil para verificar\n"
-#~ "que tódalas mensaxes do programa están traducidas.  Cando non se pode atopar\n"
-#~ "un emparellamento exacto, úsase coincidencia difusa, de xeito que se produza\n"
+#~ "ficheiro PO creado (xeralmente por xgettext).  Isto é útil para "
+#~ "verificar\n"
+#~ "que tódalas mensaxes do programa están traducidas.  Cando non se pode "
+#~ "atopar\n"
+#~ "un emparellamento exacto, úsase coincidencia difusa, de xeito que se "
+#~ "produza\n"
 #~ "un mellor diagnóstico.\n"
 
 #~ msgid "this message is used but not defined..."
@@ -414,64 +495,85 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] FICHEIRO ...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
+#~ "para\n"
 #~ "as opcións curtas.\n"
 #~ "  -d, --default-domain=NOME      usar NOME.po para a saída (en vez de\n"
 #~ "                                 messages.po)\n"
 #~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
 #~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na saída\n"
+#~ "  -e, --no-escape                non usar secuencias de escape de C na "
+#~ "saída\n"
 #~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na saída,\n"
+#~ "  -E, --escape                   usar secuencias de escape de C na "
+#~ "saída,\n"
 #~ "                                 sen caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada do\n"
+#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
+#~ "do\n"
 #~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea baleiro\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola posición do ficheiro\n"
+#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
+#~ "baleiro\n"
+#~ "  -F, --sort-by-file             ordena-la saída pola posición do "
+#~ "ficheiro\n"
 #~ "  -h, --help                     amosar esta axuda e saír\n"
 
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo indentado\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:liña'\n"
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:liña' (defecto)\n"
+#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
+#~ "indentado\n"
+#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
+#~ "liña'\n"
+#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
+#~ "liña' (defecto)\n"
 #~ "      --omit-header              non escribi-la entrada `msgid \"\"' na\n"
 #~ "                                 cabeceira\n"
 #~ "  -o, --output=FICHEIRO          escribi-la saída ao ficheiro indicado\n"
 #~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
 #~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo Uniforum\n"
+#~ "      --strict                   escribi-lo ficheiro .po de tipo "
+#~ "Uniforum\n"
 #~ "                                 estricto\n"
 #~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
-#~ "  -u, --unique                   atallo para --less-than=2, só escribi-las\n"
+#~ "  -u, --unique                   atallo para --less-than=2, só escribi-"
+#~ "las\n"
 #~ "                                 mensaxes únicas\n"
 
 #~ msgid ""
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -494,13 +596,18 @@ msgstr ""
 #~ "                                 deste número de definicións.  Se non se\n"
 #~ "                                 indica, é 1\n"
 #~ "\n"
-#~ "Atopar mensaxes que son comúns a dous ou máis dos ficheiros PO indicados.\n"
-#~ "Usando a opción --more-than, pódese requiri-la concorrencia en máis ficheiros\n"
-#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opción --less-than pódese\n"
-#~ "requiri-la concorrencia en menos ficheiros antes de escribir-las mensaxes\n"
+#~ "Atopar mensaxes que son comúns a dous ou máis dos ficheiros PO "
+#~ "indicados.\n"
+#~ "Usando a opción --more-than, pódese requiri-la concorrencia en máis "
+#~ "ficheiros\n"
+#~ "antes de escribi-las mensaxes.  Do mesmo xeito, coa opción --less-than "
+#~ "pódese\n"
+#~ "requiri-la concorrencia en menos ficheiros antes de escribir-las "
+#~ "mensaxes\n"
 #~ "(i.e. --less-than=2 só escribe as mensaxes únicas).  As traduccións,\n"
 #~ "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"
+#~ "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros "
+#~ "PO.\n"
 
 #~ msgid "error while opening \"%s\" for reading"
 #~ msgstr "erro ao abrir \"%s\" para lectura"
@@ -534,12 +641,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -554,16 +665,21 @@ msgstr ""
 #~ "Uso: %s [OPCIÓN] ficheiro.po ...\n"
 #~ "Xera un catálogo de mensaxes binario a partir da descripción textual da\n"
 #~ "traducción.\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "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"
-#~ "  -c, --check                 facer comprobacións dependentes da linguaxe\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"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de ficheiros\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "ficheiros\n"
 #~ "                              de entrada\n"
 #~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na saída\n"
 #~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro binario\n"
+#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro "
+#~ "binario\n"
 #~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de saída\n"
 #~ "      --statictics            escribi-las estatísticas das traduccións\n"
 #~ "      --strict                emprega-lo modo Uniforum estricto\n"
@@ -572,7 +688,8 @@ msgstr ""
 #~ "\n"
 #~ "Empregando a opción -v máis dunha vez, o nivel de detalle increméntase.\n"
 #~ "\n"
-#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de saída\n"
+#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de "
+#~ "saída\n"
 #~ "é -, o resultado escríbese na saída estándar.\n"
 
 #~ msgid "while creating hash table"
@@ -582,7 +699,8 @@ msgstr ""
 #~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
 #~ "%*s  warning: charset conversion will not work"
 #~ msgstr ""
-#~ "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
+#~ "%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"
 
 #~ msgid "domain name \"%s\" not suitable as file name"
@@ -618,25 +736,31 @@ msgstr ""
 #~ msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
 
 #~ 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'"
+#~ msgstr ""
+#~ "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
 
 #~ 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'"
+#~ msgstr ""
+#~ "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
 
 #~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 #~ msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
 
 #~ 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'"
+#~ msgstr ""
+#~ "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
 
 #~ 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'"
+#~ msgstr ""
+#~ "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
 
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 #~ msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
 
-#~ msgid "number of format specifications in `msgid' and `msgstr' does not match"
-#~ msgstr "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
+#~ msgid ""
+#~ "number of format specifications in `msgid' and `msgstr' does not match"
+#~ msgstr ""
+#~ "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
 #~ msgid "format specifications for argument %lu are not the same"
 #~ msgstr "as especificacións de formato do argumento %lu non son as mesmas"
@@ -644,9 +768,11 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
 #~ "                              may be specified more than once\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -e, --no-escape             do not use C escapes in output (default)\n"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
@@ -654,7 +780,8 @@ msgstr ""
 #~ "  -i, --indent                indented output style\n"
 #~ "  -o, --output-file=FILE      result will be written to FILE\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ "  -V, --version               output version information and exit\n"
@@ -663,20 +790,26 @@ msgstr ""
 #~ "Uso: %s [OPCIÓN] def.po ref.po\n"
 #~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios\n"
 #~ "para as opcións curtas.\n"
-#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de mensaxes,\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de "
+#~ "mensaxes,\n"
 #~ "                              pode ser indicada máis dunha vez\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de ficheiros\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "ficheiros\n"
 #~ "                              de entrada\n"
-#~ "  -e, --no-escape             non usar secuencias de escape de C na saída\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "saída\n"
 #~ "                              (opción por defecto)\n"
-#~ "  -E, --escape                usar secuencias de escape de C na saída, sen\n"
+#~ "  -E, --escape                usar secuencias de escape de C na saída, "
+#~ "sen\n"
 #~ "                              caracteres estendidos\n"
-#~ "      --force-po              escribi-lo ficheiro po aínda que estea baleiro\n"
+#~ "      --force-po              escribi-lo ficheiro po aínda que estea "
+#~ "baleiro\n"
 #~ "  -h, --help                  amosar esta axuda e saír\n"
 #~ "  -i, --indent                estilo de saída indentado\n"
 #~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
 #~ "      --no-location           suprimi-las liñas '#: ficheiro:liña'\n"
-#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por omisión)\n"
+#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por "
+#~ "omisión)\n"
 #~ "      --strict                estilo de saída Uniforum estricto\n"
 #~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
 #~ "  -V, --version               amosa-la información da versión e saír\n"
diff --git a/gettext-runtime/po/hr.po b/gettext-runtime/po/hr.po
index 8bdbc1625..30b7fc8df 100644
--- a/gettext-runtime/po/hr.po
+++ b/gettext-runtime/po/hr.po
@@ -3,23 +3,23 @@
 # This file is distributed under the same license as the gettext package.
 #
 # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
+# Božidar Putanec <bozidarp@yahoo.com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2016-03-30 12:23-0700\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-04-11 10:43-0800\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\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"
-"X-Generator: Poedit 1.8.7.1\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: ../../Downloads/gettext-0.19.7-rc1/gettext-runtime/src\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+"X-Generator: Lokalize 2.0\n"
 
 # Provjeriti koje nazive parametara i varijabli okoline treba prevesti... (TK)
 #: gnulib-lib/closeout.c:66
@@ -29,77 +29,54 @@ msgstr "greška pisanja"
 # Unrecognized is a synonym of unknown.
 # unrecognized is not recognized;
 # unknown is not known,  unidentified, not well known
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Nepoznata greška sustava"
 
+# promijena svih završnih navodnika s „ na “
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: opcija „%s“ je dvosmislena\n"
+
 # ambiguous: having or ​expressing more than one ​possible ​meaning
 # ambiguous: able to be understood in more than one way
 # ambiguous se češće prevodi s „dvosmislen“ ali ....
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcija „%s“ je višeznačna; mogućnosti:"
-
-# promijena svih završnih navodnika s „ na “
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: opcija „%s“ je višeznačna\n"
-
-# http://ihjj.hr/: „dopustiti“ umjesto „dozvoliti“. Umjesto „ne dopušta“/„zahtijeva“ predlažem „ne očekuje“/„očekuje“
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcija „--%s“ ne dopušta argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: opcija „%s“ je dvosmislena; mogućnosti:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nepoznata opcija „%c%s“\n"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: opcija „%c%s“ ne dopušta argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: opcija „--%s“ zahtijeva argument\n"
 
-# http://wikidiff.com/unknown/unrecognized: Unrecognized is a synonym of unknown; lingivisti ne preporučuju „nepropoznata“, ako se koristi „nije prepoznata“
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nepoznata opcija „--%s“\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nepoznata opcija „%c%s“\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neispravna opcija -- „%c“\n"
+msgstr "%s: nevaljana opcija -- „%c“\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcija zahtijeva argument -- „%c“\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcija „-W %s“ je višeznačna\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija „-W %s“ ne dopušta argument\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcija „-W %s“ zahtijeva argument\n"
-
 # doslovni prijevod iscrpljen ima više smisao izmučen = malaksao
 #: gnulib-lib/xmalloc.c:38
 #, c-format
@@ -107,20 +84,26 @@ msgid "memory exhausted"
 msgstr "nema dovoljno memorije"
 
 # http://ihjj.hr/ ppreporučuje „licencija“ umjesto „licenca“; jamstva umjesto jamstava
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Licencija GPLv3+: GNU GPL inačica 3 ili novija <http://gnu.org/licenses/gpl.html>\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencija GPLv3+:\n"
+"GNU GPL inačica 3 ili novija <http://gnu.org/licenses/gpl.html>\n"
 "Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n"
 "NEMA JAMSTVA, do granica dopuštenih zakonom.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisao %s.\n"
@@ -130,17 +113,17 @@ msgstr "Napisao %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "previše argumenata"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
-msgstr "nedostaju argumenti"
+msgstr "nema argumenata"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "„%s --help“ pomoć za uporabu i dodatne obavijesti.\n"
@@ -148,45 +131,45 @@ msgstr "„%s --help“ pomoć za uporabu i dodatne obavijesti.\n"
 # gettext manual 15.5.2.3
 # SHELL-FORMAT su strings, as supported by  gettext and the ‘envsubst’ program, are strings with references to shell variables in the form $variable or ${variable}.
 # Naziv SHELL-FORMAT (LJUSKA-FORMAT) je zbunjujući. Predložiti neku drugu riječ za SHELL-FORMAT?
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uporaba: %s [OPCIJA] [LJUSKA-FORMAT]\n"
+msgstr "Uporaba: %s [OPCIJA] [FORMAT-LJUSKE]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Zamjenjuje vrijednosti varijabli okoline.\n"
 
 # Operation mode (za razliku Mode of Operation) je više „u toku rada, u toku procesiranja“
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "U procesiranju:\n"
+msgstr "Način rada:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             ispis varijabli navedenih u LJUSKA-FORMAT\n"
+msgstr "  -v, --variables             ispiše varijable koje se javljaju u FORMAT-LJUSKE\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Dodatne obavijesti:\n"
 
 # http://ihjj.hr iziđi umjesto izađi: „prikaži pomoć i iziđi“ Ili kraće samo „pomoć“, ili „ova pomoć“; glagoli nisu nužni, jer je iz konteksta sve jasno.
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  prikaži pomoć i iziđi\n"
+msgstr "  -h, --help                  pokaže ovu pomoć i iziđe\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               podaci o inačici\n"
+msgstr "  -V, --version               informira o inačici ovog programa i iziđe\n"
 
 # envsubst:Substitutes environment variables in „shell format strings“ ali samo (i samo onda) ako su formatu $VARIJABLA ili ${VARIJABLA}!
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -196,21 +179,21 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"U normalnom procesiranju, standardni se ulaz kopira na standardni izlaz,\n"
+"U običnom načinu rada standardni ulaz kopira se na standardni izlaz,\n"
 "s time da se referencije na varijable okoline u formatu $VARIJABLA ili\n"
-"${VARIJABLA} zamijene odgovarajućim vrijednostima. Ako je LJUSKA-FORMAT\n"
-"zadan, onda će samo one varijable okoline s referencijom u LJUSKA-FORMAT\n"
-"biti zamijenjene; u suprotnom, sve varijable okoline koje se\n"
+"${VARIJABLA} zamijene odgovarajućim vrijednostima. Ako je navedeni argument\n"
+"FORMAT-LJUSKE, onda će samo one varijable okoline s referencijom u\n"
+"FORMAT-LJUSKE biti zamijenjene; u suprotnom, sve varijable okoline koje se\n"
 "pojavljuju na standardnom ulazu bit će zamijenjene.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
-"Ako se upotrijebi --variables, standardni ulaz je zanemaren, a izlaz se\n"
-"sastoji od onih varijabli okoline s referencijom u LJUSKA-FORMAT,\n"
+"Ako se upotrijebi --variables, standardni ulaz se ignorira, a izlaz se\n"
+"sastoji od onih varijabli okoline s referencijom u FORMAT-LJUSKE,\n"
 "po jedna po retku.\n"
 
 # Savjet lingvista: Ako može, onda je bolje upotrijebiti hrvatski red riječi, prvo subjekt, pa onda veznici, predikati....
@@ -218,23 +201,23 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
-"Greškice (bugs) na engleskom javite na <bug-gnu-gettext@gnu.org>.\n"
+"Greške u programu na engleskom javite na <bug-gnu-gettext@gnu.org>.\n"
 "Primjedbe i pogreške u prijevodu javite na <lokalizacija@linux.hr>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "greška pri čitanju „%s“"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standardni ulaz"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -242,45 +225,68 @@ msgstr "Ulrich Drepper"
 # gettext [option] [[textdomain] msgid]
 # gettext [option] -s [msgid]...
 # Upute koriste „msgid“, pa je možda bolje ne prevađati tu riječ.
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
 "Uporaba: %s [OPCIJA] [[TEKSTDOMENA] MSGID]\n"
-"ili:     %s [OPCIJA] -s [MSGID]...\n"
+"    ili: %s [OPCIJA] -s [MSGID]...\n"
 
 # http://ihjj.hr: „materinji“ > „materinski“
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Prijevod tekstualne poruke na materinski jezik.\n"
+msgstr "Ispiše prijevod tekstualne poruke.\n"
 
-# „retrieve“ podrazumijeva implicitno postojane prijevoda; ako prijevoda nema, onda ga ne može „retrieve“; zato promjena  „retrieve“ >  „traži“
-# jd./mn. za poruke slijedi gettext Manual.
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENA\n"
-"  -e                        proširenje nekih „escape“ sekvencija\n"
-"  -E                        (zanemaruju se zbog kompatibilnosti)\n"
-"  -h, --help                prikaži pomoć i iziđi\n"
-"  -n                        bez završnog „newline“ znaka novog retka\n"
-"  -V, --version             podaci o inačici\n"
-"  [TEKSTDOMENA] MSGID       potraži prevedenu poruku za MSGID\n"
-"                            iz TEKSTDOMENA\n"
-
-#: src/gettext.c:265
+
+# http://ihjj.hr iziđi umjesto izađi: „prikaži pomoć i iziđi“ Ili kraće samo „pomoć“, ili „ova pomoć“; glagoli nisu nužni, jer je iz konteksta sve jasno.
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  pokaže ovu pomoć i iziđe\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               informira o inačici ovog programa i iziđe\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -292,61 +298,54 @@ msgid ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Ako parametar TEKSTDOMENA nije naveden, domenu određuje varijabla okoline\n"
-"TEXTDOMAIN. Ako pak katalog poruka nije pronađen u uobičajenom direktoriju,\n"
+"Ako nije navedeni parametar TEKSTDOMENA, domenu određuje varijabla okoline\n"
+"TEXTDOMAIN. Ako nije pronađeni katalog poruka u uobičajenom direktoriju,\n"
 "alternativna lokacija može se zadati varijablom okoline TEXTDOMAINDIR.\n"
 "\n"
-"Kad se upotrijebi opcija „-s“, program se ponaša kao naredba „echo“.\n"
+"Kad se upotrijebi opcija -s, program se ponaša kao naredba „echo“.\n"
 "No umjesto jednostavnog ispisa svih svojih argumenata, program ispiše\n"
 "njihove prijevode ako ih nađe u odabranom katalogu (TEXTDOMENA).\n"
 "\n"
 "Uobičajeni direktorij za pretragu: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uporaba: %s [OPCIJA] [TEXTDOMENA] MSGID MSGID-PLURAL BROJ\n"
 
 # http://ihjj.hr: „materinji“ > „materinski“
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
-msgstr ""
-"Prijevod tekstualne poruke koja sadrži brojeve na\n"
-"materinski jezik pazeći na gramatička pravila za brojeve.\n"
+msgstr "Ispiše prijevod tekstualne poruke čiji gramatički oblik ovisi o broju\n"
 
-# 15.5.2.4 Invoking the ngettext program
-# ngettext [option] [textdomain] msgid msgid-plural count
-# U uputama „messages“ su u pluralu, u po file su u singularu. Slijedimo Upute.
-# „retrieve“ podrazumijeva implicitno
-# postojane prijevoda; ako prijevoda
-# nema, onda ga ne može „retrieve“; zato
-# promjena  „retrieve“ >  „traži“
-# jd./mn. za poruke slijedi gettext Manual.
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENA\n"
-"  -e                        proširenje nekih „escape“ sekvencija\n"
-"  -E                        (zanemaruju se zbog kompatibilnosti)\n"
-"  -h, --help                prikaži pomoć i iziđi\n"
-"  -V, --version             podaci o inačici\n"
-"  [TEKSTDOMENA]             potraži prevedenu poruku iz TEKSTDOMENA\n"
-"  MSGID MSGID-PLURAL        prijevod za MSGID (jd.) ili za MSGID-PLURAL (mn.)\n"
-"  BROJ                      izbor jd. ili oblika mn. zavisi o veličini BROJ\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -355,8 +354,80 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Ako parametar TEKSTDOMENA nije naveden, domenu određuje varijabla okoline\n"
-"TEXTDOMAIN. Ako pak katalog poruka nije pronađen u uobičajenom direktoriju,\n"
+"Ako nije navedeni parametar TEKSTDOMENA, domenu određuje varijabla okoline\n"
+"TEXTDOMAIN. Ako nije pronađeni katalog poruka u uobičajenom direktoriju,\n"
 "alternativna lokacija može se zadati varijablom okoline TEXTDOMAINDIR.\n"
 "\n"
 "Uobičajeni direktorij za pretragu: %s\n"
+
+# http://ihjj.hr/: „dopustiti“ umjesto „dozvoliti“. Umjesto „ne dopušta“/„zahtijeva“ predlažem „ne očekuje“/„očekuje“
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opcija „--%s“ ne dopušta argument\n"
+
+# http://wikidiff.com/unknown/unrecognized: Unrecognized is a synonym of unknown; lingivisti ne preporučuju „nepropoznata“, ako se koristi „nije prepoznata“
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: nepoznata opcija „--%s“\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: opcija „-W %s“ je dvosmislena\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opcija „-W %s“ ne dopušta argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: opcija „-W %s“ zahtijeva argument\n"
+
+# „retrieve“ podrazumijeva implicitno postojane prijevoda; ako prijevoda nema, onda ga ne može „retrieve“; zato promjena  „retrieve“ >  „traži“
+# jd./mn. za poruke slijedi gettext Manual.
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENE\n"
+#~ "  -e                        omogući proširenje nekih escape sekvencija\n"
+#~ "  -E                        (ignorira se zbog kompatibilnosti)\n"
+#~ "  -h, --help                pokaže ovu pomoć i iziđe\n"
+#~ "  -n                        bez završnog znaka novog retka\n"
+#~ "  -V, --version             informira o inačici ovog programa i iziđe\n"
+#~ "  [TEKSTDOMENA] MSGID       potraži prevedenu poruku\n"
+#~ "                              za MSGID u TEKSTDOMENI\n"
+
+# 15.5.2.4 Invoking the ngettext program
+# ngettext [option] [textdomain] msgid msgid-plural count
+# U uputama „messages“ su u pluralu, u po file su u singularu. Slijedimo Upute.
+# „retrieve“ podrazumijeva implicitno
+# postojane prijevoda; ako prijevoda
+# nema, onda ga ne može „retrieve“; zato
+# promjena  „retrieve“ >  „traži“
+# jd./mn. za poruke slijedi gettext Manual.
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENA\n"
+#~ "  -e                        omogući proširenje nekih escape sekvencija\n"
+#~ "  -E                        (ignorira se zbog kompatibilnosti)\n"
+#~ "  -h, --help                pokaže ovu pomoć i iziđe\n"
+#~ "  -V, --version             informira o inačici ovog programa i iziđe\n"
+#~ "  [TEKSTDOMENA]             potraži prevedenu poruku u TEKSTDOMENI\n"
+#~ "  MSGID MSGID-PLURAL        prijevod za MSGID (jednina)/MSGID-PLURAL (množina)\n"
+#~ "  BROJ                      odabere oblik za jd./mn. na temelju ovog BROJA\n"
diff --git a/gettext-runtime/po/hu.po b/gettext-runtime/po/hu.po
index b97e1ddfe..fb8333aef 100644
--- a/gettext-runtime/po/hu.po
+++ b/gettext-runtime/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-23 20:33+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
@@ -22,81 +23,65 @@ msgstr ""
 msgid "write error"
 msgstr "írási hiba"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „--%s” kapcsoló nem fogad el argumentumot\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: a(z) „%c%s” kapcsoló nem fogad el argumentumot\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ismeretlen „--%s” kapcsoló\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen -- „%c” kapcsoló\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a kapcsolóhoz egy -- „%c” argumentum szükséges\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a „-W %s” kapcsoló nem fogad el argumentumot\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "elfogyott a memória"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -105,7 +90,7 @@ msgstr ""
 "Ez egy szabad szoftver: szabadon módosíthatja és terjesztheti.\n"
 "Nincs SEMMIFÉLE GARANCIA, a törvény által megengedett mértékben.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Írta: %s.\n"
@@ -115,57 +100,57 @@ msgstr "Írta: %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "túl sok argumentum"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "hiányzó argumentumok"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "További információkért próbálja a(z) „%s --help” parancsot.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Használat: %s [KAPCSOLÓ] [SHELL-FORMÁTUM]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "A környezeti változók értékeit helyettesíti.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Működési mód:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             kiírja a SHELL-FORMÁTUMBAN előforduló változókat\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Tájékoztató kimenet:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ezen súgó megjelenítése és kilépés\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               verzióinformációk kiírása és kilépés\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -182,7 +167,7 @@ msgstr ""
 "környezeti változók lesznek helyettesítve. Egyébként a szabványos bemeneten\n"
 "előforduló összes környezeti változó hivatkozás helyettesítve lesz.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -195,25 +180,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "A hibákat ezen a címen jelentse: <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "hiba a(z) „%s” olvasása közben"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "szabványos bemenet"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -222,34 +207,56 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ] [[SZÖVEGTARTOMÁNY] MSGID]\n"
 "vagy:    %s [KAPCSOLÓ] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "A szöveges üzenet natív nyelvi fordításának megjelenítése.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenetek lekérése a\n"
-"                            SZÖVEGTARTOMÁNYBÓL\n"
-"  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
-"  -E                        (mellőzve a kompatibilitás miatt)\n"
-"  -h, --help                ezen súgó megjelenítése és kilépés\n"
-"  -n                        a záró új sorok elnyomása\n"
-"  -V, --version             verzióinformációk kiírása és kilépés\n"
-"  [SZÖVEGTARTOMÁNY] MSGID        az MSGID-nak megfelelő lefordított üzenet\n"
-"                            lekérése a SZÖVEGTARTOMÁNYBÓL\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  ezen súgó megjelenítése és kilépés\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               verzióinformációk kiírása és kilépés\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -271,12 +278,12 @@ msgstr ""
 "fordítva.\n"
 "Szabványos keresési könyvtár: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Használat: %s [KAPCSOLÓ] [SZÖVEGTARTOMÁNY] MSGID MSGID-TÖBBES DARABSZÁM\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,29 +292,31 @@ msgstr ""
 "Azon szöveges üzenet natív nyelvi fordításának megjelenítése, amelyek\n"
 "nyelvtani alakja egy számtól függ.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenet lekérése a\n"
-"                            SZÖVEGTARTOMÁNYBÓL\n"
-"  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
-"  -E                        (mellőzve a kompatibilitás miatt)\n"
-"  -h, --help                ezen súgó megjelenítése és kilépés\n"
-"  -V, --version             verzióinformációk kiírása és kilépés\n"
-"  [SZÖVEGTARTOMÁNY]         lefordított üzenet lekérése a SZÖVEGTARTOMÁNYBÓL\n"
-"  MSGID MSGID-TÖBBES        MSGID (egyesszám) / MSGID-TÖBBES (többesszám)\n"
-"  DARABSZÁM               egyesszám/többesszám választása ezen érték alapján\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -321,3 +330,65 @@ msgstr ""
 "a szabályos könyvtárban, megadható egy másik hely a SZÖVEGTARTOMÁNYKÖNYVTÁR\n"
 "környezeti változóval.\n"
 "Szabványos keresési könyvtár: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a(z) „--%s” kapcsoló nem fogad el argumentumot\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ismeretlen „--%s” kapcsoló\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: a „-W %s” kapcsoló nem fogad el argumentumot\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenetek lekérése a\n"
+#~ "                            SZÖVEGTARTOMÁNYBÓL\n"
+#~ "  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
+#~ "  -E                        (mellőzve a kompatibilitás miatt)\n"
+#~ "  -h, --help                ezen súgó megjelenítése és kilépés\n"
+#~ "  -n                        a záró új sorok elnyomása\n"
+#~ "  -V, --version             verzióinformációk kiírása és kilépés\n"
+#~ "  [SZÖVEGTARTOMÁNY] MSGID        az MSGID-nak megfelelő lefordított üzenet\n"
+#~ "                            lekérése a SZÖVEGTARTOMÁNYBÓL\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=SZÖVEGTARTOMÁNY   lefordított üzenet lekérése a\n"
+#~ "                            SZÖVEGTARTOMÁNYBÓL\n"
+#~ "  -e                        néhány fedéssorozat kifejtésének engedélyezése\n"
+#~ "  -E                        (mellőzve a kompatibilitás miatt)\n"
+#~ "  -h, --help                ezen súgó megjelenítése és kilépés\n"
+#~ "  -V, --version             verzióinformációk kiírása és kilépés\n"
+#~ "  [SZÖVEGTARTOMÁNY]         lefordított üzenet lekérése a SZÖVEGTARTOMÁNYBÓL\n"
+#~ "  MSGID MSGID-TÖBBES        MSGID (egyesszám) / MSGID-TÖBBES (többesszám)\n"
+#~ "  DARABSZÁM               egyesszám/többesszám választása ezen érték alapján\n"
diff --git a/gettext-runtime/po/id.po b/gettext-runtime/po/id.po
index 7e95a69ca..46751b0d8 100644
--- a/gettext-runtime/po/id.po
+++ b/gettext-runtime/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2010-05-09 13:18+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2010-05-24 13:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -18,81 +18,71 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "kesalahan penulisan"
 
-#: gnulib-lib/error.c:181
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tak dikenal"
 
-#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: pilihan '%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"
-msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: pilihan tak dikenal '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' memerlukan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: pilihan tak dikenal '--%s'\n"
-
-#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: pilihan tak dikenal '%c%s'\n"
-
-#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
-#: gnulib-lib/getopt.c:1053
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: pilihan '-W %s' rancu\n"
-
-#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
-
-#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: pilihan '-W %s' memerlukan sebuah argumen\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -101,7 +91,7 @@ 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/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
@@ -111,57 +101,58 @@ msgstr "Ditulis oleh %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "Argumen hilang"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Penggunaan: %s [PILIHAN] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Gantilah nilai variabel lingkungan.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             hasilkan variabel yang muncul dalam SHELL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informatif:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               informasi versi dan keluar\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -179,7 +170,7 @@ msgstr ""
 "; bila tidak semua variabel lingkungan yang diacu yang muncul dalam \n"
 "input standar akan diganti.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -192,25 +183,25 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan kesalahan ke <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -219,40 +210,72 @@ msgstr ""
 "Pemakaian: %s [PILIHAN] [[TEXTDOMAIN] ID-PESAN]\n"
 "atau:    %s [PILIHAN] -s [ID-PESAN]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Tampilkan terjemahan bahasa asli pesan tekstual.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   mengambil pesan terjemahan dari TEXTDOMAIN\n"
-"  -e                        memungkinkan ekspansi beberapa escape sequence\n"
-"  -E                        (abaikan kompatibilitas)\n"
-"  -h, --help                tampilkan bantuan ini dan keluar\n"
-"  -n                        hilangkan newline yang mengekor\n"
-"  -V, --version             tampilkan informasi versi dan keluar\n"
-"  [TEXTDOMAIN] ID-PESAN     mengambil pesan terjemahan yang sesuai\n"
-"                            untuk ID-PESAN dari TEXTDOMAIN\n"
-
-#: src/gettext.c:264
-#, c-format, no-wrap
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               informasi versi dan keluar\n"
+
+#: src/gettext.c:285
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#| "regular directory, another location can be specified with the environment\n"
+#| "variable TEXTDOMAINDIR.\n"
+#| "When used with the -s option the program behaves like the `echo' command.\n"
+#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#| "found in the selected catalog are translated.\n"
+#| "Standard search directory: %s\n"
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -266,12 +289,12 @@ msgstr ""
 "diterjemahkan.\n"
 "Direktori pencarian standar: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Pemakaian: %s [PILIHAN] [TEXTDOMAIN] ID-PESAN ID-PESAN-PLURAL JUMLAH\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -280,29 +303,31 @@ msgstr ""
 "Tampilkan terjemahan bahasa asli pesan tekstual yang bentuk gramatikalnya\n"
 "tergantung pada suatu angka.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   mengambil pesan terjemahan dari TEXTDOMAIN\n"
-"  -e                        memungkinkan ekspansi beberapa escape sequence\n"
-"  -E                        (abaikan kompatibilitas)\n"
-"  -h, --help                tampilkan bantuan ini dan keluar\n"
-"  -n                        hilangkan newline yang mengekor\n"
-"  -V, --version             tampilkan informasi versi dan keluar\n"
-"  [TEXTDOMAIN]              mengambil pesan terjemahan dari TEXTDOMAIN\n"
-"  ID-PESAN ID-PESAN-PLURAL  terjemahkan ID-PESAN (tunggal) / ID-PESAN-PLURAL (plural)\n"
-"  JUMLAH                    pilih bentuk tunggal/plural berdasarkan nilai ini\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,15 +342,79 @@ msgstr ""
 "lingkungan TEXTDOMAINDIR.\n"
 "Direktori pencarian standar: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: pilihan tak dikenal '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: pilihan '-W %s' rancu\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: pilihan '-W %s' memerlukan sebuah argumen\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   mengambil pesan terjemahan dari TEXTDOMAIN\n"
+#~ "  -e                        memungkinkan ekspansi beberapa escape sequence\n"
+#~ "  -E                        (abaikan kompatibilitas)\n"
+#~ "  -h, --help                tampilkan bantuan ini dan keluar\n"
+#~ "  -n                        hilangkan newline yang mengekor\n"
+#~ "  -V, --version             tampilkan informasi versi dan keluar\n"
+#~ "  [TEXTDOMAIN] ID-PESAN     mengambil pesan terjemahan yang sesuai\n"
+#~ "                            untuk ID-PESAN dari TEXTDOMAIN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   mengambil pesan terjemahan dari TEXTDOMAIN\n"
+#~ "  -e                        memungkinkan ekspansi beberapa escape sequence\n"
+#~ "  -E                        (abaikan kompatibilitas)\n"
+#~ "  -h, --help                tampilkan bantuan ini dan keluar\n"
+#~ "  -n                        hilangkan newline yang mengekor\n"
+#~ "  -V, --version             tampilkan informasi versi dan keluar\n"
+#~ "  [TEXTDOMAIN]              mengambil pesan terjemahan dari TEXTDOMAIN\n"
+#~ "  ID-PESAN ID-PESAN-PLURAL  terjemahkan ID-PESAN (tunggal) / ID-PESAN-PLURAL (plural)\n"
+#~ "  JUMLAH                    pilih bentuk tunggal/plural berdasarkan nilai ini\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: pilihan ilegal -- %c\n"
 
 # )
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Hak Cipta (C) %s Free Software Foundation, Inc.\n"
-#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n"
+#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak "
+#~ "ada\n"
 #~ "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
diff --git a/gettext-runtime/po/it.po b/gettext-runtime/po/it.po
index 5d5b984a7..ebeaf15f8 100644
--- a/gettext-runtime/po/it.po
+++ b/gettext-runtime/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-08-05 12:00+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,86 +16,71 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione '%s' è ambigua; scelte:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: l'opzione '%s' è ambigua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: l'opzione '%s' è ambigua; scelte:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opzione '%c%s' non riconosciuta\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '%c%s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: l'opzione '%s' richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opzione '--%s' non riconosciuta\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opzione '%c%s' non riconosciuta\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opzione non valida -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l'opzione richiede un argomento -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'opzione '-W %s' è ambigua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l'opzione '-W %s' richiede un argomento\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -105,7 +90,7 @@ msgstr ""
 "Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
@@ -115,57 +100,57 @@ msgstr "Scritto da %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argomenti mancanti"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Usare '%s --help' per maggiori informazioni.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Uso: %s [OPZIONE] [FORMATO-SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Sostituisce i valori delle variabili d'ambiente.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             mostra le variabili che appaiono in FORMATO-SHELL\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +168,7 @@ msgstr ""
 "sostituiti tutti i riferimenti alle variabili d'ambiente che appaiono sullo\n"
 "standard input.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -197,25 +182,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -224,32 +209,57 @@ msgstr ""
 "Uso: %s [OPZIONE] [[DOMINIOTESTO] MSGID]\n"
 "  o: %s [OPZIONE] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Mostra la traduzione di un messaggio di testo in linguaggio nativo.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMINIOTESTO recupera i messaggi tradotti da DOMINIOTESTO\n"
-"  -e                        abilita l'espansione di alcune sequenze di escape\n"
-"  -E                        (ignorato per compatibilità)\n"
-"  -h, --help                mostra questo aiuto ed esce\n"
-"  -V, --version             mostra le informazioni sulla versione ed esce\n"
-"  [DOMINIOTESTO] MSGID      recupera da DOMINIOTESTO i messaggi tradotti\n"
-"                            corrispondenti a MSGID\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               mostra le informazioni sulla versione ed esce\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -270,12 +280,12 @@ msgstr ""
 "traduce i messaggi trovati nel catalogo selezionato.\n"
 "Directory di ricerca standard: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPZIONE] [DOMINIOTESTO] MSGID MSGID-PLURAL NUMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,30 +294,31 @@ msgstr ""
 "Mostra la traduzione di un messaggio di testo, la cui forma grammaticale\n"
 "dipende da un numero, in linguaggio nativo.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMINIOTESTO recupera i messaggi tradotti da DOMINIOTESTO\n"
-"  -e                        abilita l'espansione di alcune sequenze di escape\n"
-"  -E                        (ignorato per compatibilità)\n"
-"  -h, --help                mostra questo aiuto ed esce\n"
-"  -V, --version             mostra le informazioni sulla versione ed esce\n"
-"  [DOMINIOTESTO]            recupera da DOMINIOTESTO i messaggi tradotti\n"
-"  MSGID MSGID-PLURAL        traduce MSGID (singolare) e MSGID-PLURAL (plurale)\n"
-"  NUMERO                    sceglie la forma singolare/plurale in base a\n"
-"                            questo valore\n"
-"\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -321,3 +332,64 @@ msgstr ""
 "nella directory solita, può essere specificata un'altra posizione con la\n"
 "variabile d'ambiente TEXTDOMAINDIR.\n"
 "Directory di ricerca standard: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opzione '--%s' non accetta argomenti\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opzione '--%s' non riconosciuta\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: l'opzione '-W %s' è ambigua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opzione '-W %s' non accetta argomenti\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: l'opzione '-W %s' richiede un argomento\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIOTESTO recupera i messaggi tradotti da DOMINIOTESTO\n"
+#~ "  -e                        abilita l'espansione di alcune sequenze di escape\n"
+#~ "  -E                        (ignorato per compatibilità)\n"
+#~ "  -h, --help                mostra questo aiuto ed esce\n"
+#~ "  -V, --version             mostra le informazioni sulla versione ed esce\n"
+#~ "  [DOMINIOTESTO] MSGID      recupera da DOMINIOTESTO i messaggi tradotti\n"
+#~ "                            corrispondenti a MSGID\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMINIOTESTO recupera i messaggi tradotti da DOMINIOTESTO\n"
+#~ "  -e                        abilita l'espansione di alcune sequenze di escape\n"
+#~ "  -E                        (ignorato per compatibilità)\n"
+#~ "  -h, --help                mostra questo aiuto ed esce\n"
+#~ "  -V, --version             mostra le informazioni sulla versione ed esce\n"
+#~ "  [DOMINIOTESTO]            recupera da DOMINIOTESTO i messaggi tradotti\n"
+#~ "  MSGID MSGID-PLURAL        traduce MSGID (singolare) e MSGID-PLURAL (plurale)\n"
+#~ "  NUMERO                    sceglie la forma singolare/plurale in base a\n"
+#~ "                            questo valore\n"
+#~ "\n"
diff --git a/gettext-runtime/po/ja.po b/gettext-runtime/po/ja.po
index e38515675..ad1b194cc 100644
--- a/gettext-runtime/po/ja.po
+++ b/gettext-runtime/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-24 12:18+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -15,87 +15,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "�񤭹��ߥ��顼"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: ���ץ���� '%s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '%c%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: ���ץ���� '--%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ���ץ���� '--%s' ���Բ�\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵���ʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ������ɬ�פʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -109,7 +94,7 @@ msgstr ""
 "����ϥե꡼�����եȥ������Ǥ�. ���ѤȺ����ۤϼ�ͳ�Ǥ�.\n"
 "ˡ�ǵ����줿�ϰ����̵�ݾڤǤ�.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "��� %s.\n"
@@ -119,57 +104,57 @@ msgstr "��� %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "������¿�����ޤ�"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "����������ޤ���"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "���¿���ξ�������뤿��ˤ� '%s --help' �����Ϥ��Ƥ�������.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "����ˡ: %s [���ץ����] [���������]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "�Ķ��ѿ����ͤ�����.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "���ڥ졼�����⡼��:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             ����������˸�����ѿ������\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "ͭ�פʽ���:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ���Υإ�פ�ɽ�����ƽ�λ\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               �С������������Ϥ��ƽ�λ\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -184,7 +169,7 @@ msgstr ""
 "��������������ꤵ����, ����������ǻ��Ȥ����, ���Τ褦�ʴĶ��ѿ�������\n"
 "��������ޤ���, �����Ǥʤ�����ɸ�����Ϥ˸�������ƤδĶ��ѿ�����������ޤ�.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -197,25 +182,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "�Х���ݡ��Ȥ� <bug-gnu-gettext@gnu.org> �ޤ�.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" �ɤ߹�����Υ��顼"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "ɸ������"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -224,33 +209,56 @@ msgstr ""
 "����ˡ: %s [���ץ����] [[TEXTDOMAIN] MSGID]\n"
 "�ޤ���: %s [���ץ����] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "��ʸ�Υ�å������μ����������ɽ��.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   TEXTDOMAIN �����������줿��å���������Ф�\n"
-"  -e                        ���������ץ������󥹤�Ÿ������\n"
-"  -E                        (�ߴ����Τ����̵�뤵���)\n"
-"  -h, --help                ���Υإ�פ�ɽ�����ƽ�λ\n"
-"  -n                        �����β��Ԥ���Ϥ��ʤ�\n"
-"  -V, --version             �С����������ɽ�����ƽ�λ\n"
-"  [TEXTDOMAIN] MSGID        MSGID �˱�����������å������� TEXTDOMAIN ����\n"
-"                            ����\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  ���Υإ�פ�ɽ�����ƽ�λ\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               �С������������Ϥ��ƽ�λ\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -271,40 +279,43 @@ msgstr ""
 "�������줿��Τ�ɽ�����ޤ�.\n"
 "ɸ��θ����ǥ��쥯�ȥ�: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "����ˡ: %s [���ץ����] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "ʸˡ��, ���������ˤ�äưۤʤäƤ��븶ʸ��å������μ����������ɽ��.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   TEXTDOMAIN �����������줿��å���������Ф�\n"
-"  -e                        ���������ץ������󥹤�Ÿ������\n"
-"  -E                        (�ߴ����Τ����̵�뤵���)\n"
-"  -h, --help                ���Υإ�פ�ɽ�����ƽ�λ\n"
-"  -V, --version             �С����������ɽ�����ƽ�λ\n"
-"  [TEXTDOMAIN]              ������å������� TEXTDOMAIN ������Ф�\n"
-"  MSGID MSGID-PLURAL        MSGID (ñ����) / MSGID-PLURAL (ʣ����) ������\n"
-"  COUNT                     �����ͤ���ܤˤ���ñ��/ʣ����������\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,3 +328,63 @@ msgstr ""
 "�ɥᥤ�󤬷�ޤ�ޤ�. �⤷ɸ��Υǥ��쥯�ȥ�˥�å���������������\n"
 "���Ĥ���ʤ����, �Ķ��ѿ� TEXTDOMAINDIR �ǻ��ꤵ�줿��꤫��õ���ޤ�.\n"
 "ɸ��θ����ǥ��쥯�ȥ�: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ���ץ���� '--%s' ���Բ�\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   TEXTDOMAIN �����������줿��å���������Ф�\n"
+#~ "  -e                        ���������ץ������󥹤�Ÿ������\n"
+#~ "  -E                        (�ߴ����Τ����̵�뤵���)\n"
+#~ "  -h, --help                ���Υإ�פ�ɽ�����ƽ�λ\n"
+#~ "  -n                        �����β��Ԥ���Ϥ��ʤ�\n"
+#~ "  -V, --version             �С����������ɽ�����ƽ�λ\n"
+#~ "  [TEXTDOMAIN] MSGID        MSGID �˱�����������å������� TEXTDOMAIN ����\n"
+#~ "                            ����\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   TEXTDOMAIN �����������줿��å���������Ф�\n"
+#~ "  -e                        ���������ץ������󥹤�Ÿ������\n"
+#~ "  -E                        (�ߴ����Τ����̵�뤵���)\n"
+#~ "  -h, --help                ���Υإ�פ�ɽ�����ƽ�λ\n"
+#~ "  -V, --version             �С����������ɽ�����ƽ�λ\n"
+#~ "  [TEXTDOMAIN]              ������å������� TEXTDOMAIN ������Ф�\n"
+#~ "  MSGID MSGID-PLURAL        MSGID (ñ����) / MSGID-PLURAL (ʣ����) ������\n"
+#~ "  COUNT                     �����ͤ���ܤˤ���ñ��/ʣ����������\n"
diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po
index 243473c3f..7413b2ed9 100644
--- 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.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-28 05:22+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
@@ -17,87 +17,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: '%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: '%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: '--%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 잘못된 옵션 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,7 +91,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s이(가) 만들었습니다.\n"
@@ -116,57 +101,57 @@ msgstr "%s이(가) 만들었습니다.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "인수가 너무 많음"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "인수가 빠졌음"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "사용법: %s [<옵션>] [<쉘-형식>]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "환경 변수 값을 치환합니다.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "동작 모드:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             <쉘-형식>에 나오는 변수를 출력합니다\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "정보 출력:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  이 도움말을 표시하고 끝납니다\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -181,7 +166,7 @@ msgstr ""
 "<쉘-형식>을 쓰면, <쉘-형식>에서 사용한 환경 변수만 치환합니다; <쉘-형식>을\n"
 "쓰지 않으면 표준 입력의 모든 환경 변수를 치환합니다.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -194,25 +179,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "표준 입력"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -221,33 +206,56 @@ msgstr ""
 "사용법: %s [<옵션>] [[<TEXTDOMAIN>] <MSGID>]\n"
 "혹은:   %s [<옵션>] -s [<MSGID>]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "주어진 메시지에 대한 고유어 번역문을 표시합니다.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=<TEXTDOMAIN> 번역된 메시지를 <TEXTDOMAIN>에서 불러옵니다\n"
-"  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
-"  -E                        (호환성을 위해 무시됨)\n"
-"  -h, --help                이 도움말을 보여주고 종료합니다\n"
-"  -n                        따라붙는 줄바꿈 문자를 제거합니다\n"
-"  -V, --version             버전 정보를 표시하고 종료합니다\n"
-"  [<TEXTDOMAIN>] <MSGID>    <MSGID>에 대응하는 번역된 메시지를 <TEXTDOMAIN>에서\n"
-"                            불러옵니다\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  이 도움말을 표시하고 끝납니다\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -268,12 +276,12 @@ msgstr ""
 "목록에서 번역되어 있는 메시지만이 출력됩니다.\n"
 "기본 탐색 디렉터리: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "사용법: %s [<옵션>] [<TEXTDOMAIN>] <MSGID> <MSGID-PLURAL> <개수>\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -282,28 +290,31 @@ msgstr ""
 "숫자에 따라 문법이 달라지는, 주어진 메시지에 대한 고유어 번역문을\n"
 "표시합니다.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
-"  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
-"  -E                        (호환성을 위해 무시됨)\n"
-"  -h, --help                이 도움말을 보여주고 끝납니다\n"
-"  -V, --version             버전 정보를 표시하고 끝납니다\n"
-"  [TEXTDOMAIN]              번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
-"  MSGID MSGID-복수형        MSGID(단수) / MSGID-복수형(복수)을 번역합니다\n"
-"  개수                      이 값에 따라 단수/복수를 결정합니다\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,3 +328,63 @@ msgstr ""
 "TEXTDOMAINDIR로 다른 위치를 지정할 수 있습니다.\n"
 "\n"
 "표준 탐색 디렉터리: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=<TEXTDOMAIN> 번역된 메시지를 <TEXTDOMAIN>에서 불러옵니다\n"
+#~ "  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
+#~ "  -E                        (호환성을 위해 무시됨)\n"
+#~ "  -h, --help                이 도움말을 보여주고 종료합니다\n"
+#~ "  -n                        따라붙는 줄바꿈 문자를 제거합니다\n"
+#~ "  -V, --version             버전 정보를 표시하고 종료합니다\n"
+#~ "  [<TEXTDOMAIN>] <MSGID>    <MSGID>에 대응하는 번역된 메시지를 <TEXTDOMAIN>에서\n"
+#~ "                            불러옵니다\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
+#~ "  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
+#~ "  -E                        (호환성을 위해 무시됨)\n"
+#~ "  -h, --help                이 도움말을 보여주고 끝납니다\n"
+#~ "  -V, --version             버전 정보를 표시하고 끝납니다\n"
+#~ "  [TEXTDOMAIN]              번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
+#~ "  MSGID MSGID-복수형        MSGID(단수) / MSGID-복수형(복수)을 번역합니다\n"
+#~ "  개수                      이 값에 따라 단수/복수를 결정합니다\n"
diff --git a/gettext-runtime/po/nb.po b/gettext-runtime/po/nb.po
index af949c623..2f26b4267 100644
--- a/gettext-runtime/po/nb.po
+++ b/gettext-runtime/po/nb.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-12-23 03:17+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.9\n"
 
@@ -23,81 +24,65 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefeil"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valget «%s» er tvetydig: muligheter:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: valget «%s» er tvetydig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke argumenter\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valget «%s» er tvetydig: muligheter:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: valget «%s» krever et argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig valg -- «%c»\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valget krever et argument -- «%c»\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er tvetydig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke et argument\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valget «%s» krever et argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,7 +91,7 @@ msgstr ""
 "Dette er Fri programvare: du står fritt til å endre og redistribuere det.\n"
 "Det er INGEN GARANTI, i den grad loven tillater.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
@@ -116,57 +101,57 @@ msgstr "Skrevet av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "mangler argumenter"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Bruk: %s [VALG] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Erstatter miljøvariabelverdiene.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Driftsmodus:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             skriver ut variablene som forekommer i SHELL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  vis denne hjelpeteksten og avslutt\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               skriv ut versjonsinformasjon og avslutt\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +168,7 @@ msgstr ""
 "byttet; ellers alle miljøvariablene referanser skjer i\n"
 "standard inngang er byttet ut.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -196,27 +181,27 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 "Rapporter oversettelsesfeil til <i18n-nb@lister.ping.uio.no>\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard inn"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -225,33 +210,57 @@ msgstr ""
 "Bruk:  %s [VALG] [[TEKSTDOMENE] MSGID]\n"
 "eller: %s [VALG] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Vis morsmåloversettelse av en tekstmelding.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENE   hent oversatte meldinger fra TEKSTDOMENE\n"
-"  -e                        slå på ekspandering av noen escape-sekvenser\n"
-"  -E                        (tillatt av kompatibilitetshensyn)\n"
-"  -h, --help                vis denne hjelpeteksten og avslutt\n"
-"  -n                        undertrykk etterfølgende linjeskift\n"
-"  -v, --version             vis programversjon og avslutt\n"
-"  [TEKSTDOMENE] MSGID        hent oversatt melding som stemmer overens med MSGID\n"
-"                            fra TEKSTDOMENE\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  vis denne hjelpeteksten og avslutt\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               skriv ut versjonsinformasjon og avslutt\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -272,12 +281,12 @@ msgstr ""
 "stedet blir meldinger funnet i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Bruk: %s [VALG] [TEKSTDOMENE] MSGID MSGID-FLERTALL ANTALL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -286,28 +295,31 @@ msgstr ""
 "Vis morsmåloversettelse av en tekstmelding hvis grammatiske\n"
 "form avhenger av et tall.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENE   hent oversatte meldinger fra TEKSTDOMENE\n"
-"  -e                        slå på ekspandering av noen escape-sekvenser\n"
-"  -E                        (tillatt av kompatibilitetshensyn)\n"
-"  -h, --help                vis denne hjelpeteksten og avslutt\n"
-"  -v, --version             vis programversjon og avslutt\n"
-"  [TEKSTDOMENE]              hent oversatt melding fra TEKSTDOMENE\n"
-"  MSGID MSGID-FLERTALL        oversett MSGID (entall) / MSGID-FLERTALL (flertall)\n"
-"  COUNT                     velg entalls-/flertallsform basert på denne verdien\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -322,6 +334,66 @@ msgstr ""
 "miljøvariabelen TEXTDOMAINDIR.\n"
 "Standard søkekatalog er: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: valget «--%s» tillater ikke argumenter\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ukjent valg «--%s»\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: valget «-W %s» er tvetydig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: valget «%s» krever et argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMENE   hent oversatte meldinger fra TEKSTDOMENE\n"
+#~ "  -e                        slå på ekspandering av noen escape-sekvenser\n"
+#~ "  -E                        (tillatt av kompatibilitetshensyn)\n"
+#~ "  -h, --help                vis denne hjelpeteksten og avslutt\n"
+#~ "  -n                        undertrykk etterfølgende linjeskift\n"
+#~ "  -v, --version             vis programversjon og avslutt\n"
+#~ "  [TEKSTDOMENE] MSGID        hent oversatt melding som stemmer overens med MSGID\n"
+#~ "                            fra TEKSTDOMENE\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMENE   hent oversatte meldinger fra TEKSTDOMENE\n"
+#~ "  -e                        slå på ekspandering av noen escape-sekvenser\n"
+#~ "  -E                        (tillatt av kompatibilitetshensyn)\n"
+#~ "  -h, --help                vis denne hjelpeteksten og avslutt\n"
+#~ "  -v, --version             vis programversjon og avslutt\n"
+#~ "  [TEKSTDOMENE]              hent oversatt melding fra TEKSTDOMENE\n"
+#~ "  MSGID MSGID-FLERTALL        oversett MSGID (entall) / MSGID-FLERTALL (flertall)\n"
+#~ "  COUNT                     velg entalls-/flertallsform basert på denne verdien\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ulovlig flagg -- %c\n"
 
@@ -329,12 +401,16 @@ msgstr ""
 # Er denne oversettelsen grei nok?
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Dette er fri pogramvare; se kildekoden for kopieringsbetingelser.  Det finnes\n"
-#~ "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT\n"
+#~ "Dette er fri pogramvare; se kildekoden for kopieringsbetingelser.  Det "
+#~ "finnes\n"
+#~ "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET "
+#~ "BESTEMT\n"
 #~ "FORMÅL.\n"
 
 #~ msgid "error while opening \"%s\" for reading"
@@ -365,11 +441,14 @@ msgstr ""
 #~ msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
-#~ msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
@@ -377,7 +456,9 @@ msgstr ""
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
-#~ msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
@@ -385,7 +466,9 @@ msgstr ""
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
@@ -397,15 +480,21 @@ msgstr ""
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#~ "tuple"
 #~ msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#~ "mapping"
 #~ msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
 #, fuzzy
-#~ msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
@@ -413,7 +502,9 @@ msgstr ""
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #~ msgid "%s and %s are mutually exclusive"
@@ -427,21 +518,27 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                write the .po file using indented style\n"
 #~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -464,17 +561,21 @@ msgstr ""
 #~ "before messages are printed.  Conversely, the --less-than option may be\n"
 #~ "used to specify less commonality before messages are printed (i.e.\n"
 #~ "--less-than=2 will only print the unique messages).  Translations,\n"
-#~ "comments and extract comments will be cumulated, except that if --use-first\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
 #~ "is specified, they will be taken from the first PO file to define them.\n"
 #~ "File positions from all PO files will be cumulated.\n"
 #~ msgstr ""
 #~ "  -V, --version                  skrive ut programversjon og avslutte\n"
 #~ "  -w, --width=ANTALL             sett sidebredden i utdata\n"
-#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-#~ "                                 definisjoner, standard er uendelig dersom\n"
+#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn "
+#~ "ANTALL\n"
+#~ "                                 definisjoner, standard er uendelig "
+#~ "dersom\n"
 #~ "                                 ikke satt\n"
 #~ "  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-#~ "                                 definisjoner, standard er 1 dersom ikke satt\n"
+#~ "                                 definisjoner, standard er 1 dersom ikke "
+#~ "satt\n"
 #~ "\n"
 #~ "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
 #~ "Ved å bruke --more-than-flagget, kan økt fellesskap bli anmodet\n"
@@ -489,7 +590,8 @@ msgstr ""
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 0 if not set\n"
@@ -498,11 +600,14 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  skrive ut programversjon og avslutte\n"
 #~ "  -w, --width=ANTALL             sett sidebredden i utdata\n"
-#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-#~ "                                 definisjoner, standard er uendelig dersom\n"
+#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn "
+#~ "ANTALL\n"
+#~ "                                 definisjoner, standard er uendelig "
+#~ "dersom\n"
 #~ "                                 ikke satt\n"
 #~ "  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-#~ "                                 definisjoner, standard er 1 dersom ikke satt\n"
+#~ "                                 definisjoner, standard er 1 dersom ikke "
+#~ "satt\n"
 #~ "\n"
 #~ "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
 #~ "Ved å bruke --more-than-flagget, kan økt fellesskap bli anmodet\n"
@@ -517,28 +622,39 @@ msgstr ""
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for each\n"
-#~ "                                 message, don't merge several translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -560,21 +676,29 @@ msgstr ""
 #~ msgid ""
 #~ "Compare two Uniforum style .po files to check that both contain the same\n"
 #~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
-#~ "translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
 #~ "file (generally created by xgettext).  This is useful for checking that\n"
-#~ "you have translated each and every message in your program.  Where an exact\n"
-#~ "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ "you have translated each and every message in your program.  Where an "
+#~ "exact\n"
+#~ "match cannot be found, fuzzy matching is used to produce better "
+#~ "diagnostics.\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
-#~ "  -D, --directory=KATALOG     legge til KATALOG til søkelisten for innfiler\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
+#~ "  -D, --directory=KATALOG     legge til KATALOG til søkelisten for "
+#~ "innfiler\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -V, --version               skrive ut programversjon og avslutte\n"
 #~ "\n"
-#~ "Sammenligne to Uniforum-aktige .po-filer for å sjekke at begge inneholder\n"
-#~ "det samme settet med msgid-strenger.  def.po-filen er en eksisterende PO-fil\n"
+#~ "Sammenligne to Uniforum-aktige .po-filer for å sjekke at begge "
+#~ "inneholder\n"
+#~ "det samme settet med msgid-strenger.  def.po-filen er en eksisterende PO-"
+#~ "fil\n"
 #~ "med de gamle oversettelsene.  ref.po-filen er det sist lagde PO(T)-filen\n"
-#~ "(som regel av xgettext).  Dette er nyttig for å sjekke at du har oversatt\n"
+#~ "(som regel av xgettext).  Dette er nyttig for å sjekke at du har "
+#~ "oversatt\n"
 #~ "alle meldingene i programmet ditt.  Når en eksakt overensstemmelse ikke\n"
 #~ "finnes, blir «fuzzy»-sammenligning brukt for å få en bedre diagnostikk.\n"
 
@@ -611,11 +735,14 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  skrive ut programversjon og avslutte\n"
 #~ "  -w, --width=ANTALL             sett sidebredden i utdata\n"
-#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-#~ "                                 definisjoner, standard er uendelig dersom\n"
+#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn "
+#~ "ANTALL\n"
+#~ "                                 definisjoner, standard er uendelig "
+#~ "dersom\n"
 #~ "                                 ikke satt\n"
 #~ "  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-#~ "                                 definisjoner, standard er 1 dersom ikke satt\n"
+#~ "                                 definisjoner, standard er 1 dersom ikke "
+#~ "satt\n"
 #~ "\n"
 #~ "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
 #~ "Ved å bruke --more-than-flagget, kan økt fellesskap bli anmodet\n"
@@ -630,7 +757,8 @@ msgstr ""
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -639,11 +767,14 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  skrive ut programversjon og avslutte\n"
 #~ "  -w, --width=ANTALL             sett sidebredden i utdata\n"
-#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-#~ "                                 definisjoner, standard er uendelig dersom\n"
+#~ "  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn "
+#~ "ANTALL\n"
+#~ "                                 definisjoner, standard er uendelig "
+#~ "dersom\n"
 #~ "                                 ikke satt\n"
 #~ "  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-#~ "                                 definisjoner, standard er 1 dersom ikke satt\n"
+#~ "                                 definisjoner, standard er 1 dersom ikke "
+#~ "satt\n"
 #~ "\n"
 #~ "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
 #~ "Ved å bruke --more-than-flagget, kan økt fellesskap bli anmodet\n"
@@ -657,27 +788,37 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -697,21 +838,26 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -749,23 +895,29 @@ msgstr ""
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -892,21 +1044,26 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -923,13 +1080,17 @@ msgstr ""
 #~ msgstr "%s: advarsel: "
 
 #, fuzzy
-#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
 #~ msgstr ""
 #~ "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 #~ "og iconv() støtter ikke \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
+#~ "was built without iconv()."
 #~ msgstr ""
 #~ "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 #~ "Denne versjonen ble blygget uten iconv().\n"
@@ -939,7 +1100,8 @@ msgstr ""
 #~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
 #~ "existing PO file with translations which will be taken over to the newly\n"
 #~ "created file as long as they still match; comments will be preserved,\n"
-#~ "but extracted comments and file positions will be discarded.  The ref.pot\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
 #~ "file is the last created PO file with up-to-date source references but\n"
 #~ "old translations, or a PO Template file (generally created by xgettext);\n"
 #~ "any translations or comments in the file will be discarded, however dot\n"
@@ -949,13 +1111,17 @@ msgstr ""
 #~ "\n"
 #~ "Fletter sammen to Uniforum .po-filer.  def.po-filen er en eksisterende\n"
 #~ "PO-fil med gamle oversettelser, som vil bli overført til den nye filen\n"
-#~ "dersom de fremdeles stemmer.  Kommentarer blir tatt med, men kommentarer om\n"
-#~ "selve ekstraheringen og fil-posisjoner blir slettet.  ref.po-filen er den\n"
-#~ "sist genererte PO-filen (vanligvis generert med xgettext).  Oversettelser\n"
+#~ "dersom de fremdeles stemmer.  Kommentarer blir tatt med, men kommentarer "
+#~ "om\n"
+#~ "selve ekstraheringen og fil-posisjoner blir slettet.  ref.po-filen er "
+#~ "den\n"
+#~ "sist genererte PO-filen (vanligvis generert med xgettext).  "
+#~ "Oversettelser\n"
 #~ "eller kommentarer i denne filen blir slettet, men punktum-kommentarer og\n"
 #~ "fil-posisjoner blir ivaretatt.  Der det ikke lar seg gjøre å finne en\n"
 #~ "eksakt overensstemmelse, blir «fuzzy» sammenligning brukt for å få bedre\n"
-#~ "resultater.  Resultatet blir skrevet til standard ut, med mindre en utfil\n"
+#~ "resultater.  Resultatet blir skrevet til standard ut, med mindre en "
+#~ "utfil\n"
 #~ "er spesifisert.\n"
 
 #, fuzzy
@@ -966,8 +1132,12 @@ msgstr ""
 #~ msgid "this message should not define plural forms"
 #~ msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#~ msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-#~ msgstr "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, foreldete %ld.\n"
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
+#~ "foreldete %ld.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " ferdig.\n"
@@ -990,9 +1160,11 @@ msgstr ""
 #~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] [FIL]...\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -e, --no-escape          ikke bruk C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvidede tegn\n"
+#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po           skriv PO-fil selv om deb vil bli tom\n"
 #~ "  -h, --help               vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent             skriv utdata med innrykk\n"
@@ -1127,8 +1299,10 @@ msgstr ""
 #~ msgid "error while opening \"%s\" for writing"
 #~ msgstr "feil under åpning av «%s» for skriving"
 
-#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
 #~ msgid "cannot create output file \"%s\""
 #~ msgstr "kan ikke opprette utfilen «%s»"
@@ -1146,42 +1320,57 @@ msgstr ""
 #~ msgstr "denne filen kan ikke inneholde domene-direktiver"
 
 #~ 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"
+#~ msgstr ""
+#~ "--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
 
 #~ msgid "xgettext cannot work without keywords to look for"
 #~ msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
 #~ 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"
+#~ msgstr ""
+#~ "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 
 #, fuzzy
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
-#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede tegn\n"
+#~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
+#~ "tegn\n"
 #~ "      --force-po              skriv PO-fil selv om den blir tom\n"
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
@@ -1235,21 +1424,30 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er også obligatorisk for korte flagg.\n"
-#~ "  -d, --default-domain=NAVN      bruk NAVN.po som resultatfil (istedet for messages.po)\n"
-#~ "  -D, --directory=KATALOG        legge til KATALOG til søkelisten for innfiler\n"
-#~ "  -e, --no-escape                ikke bruk C-escapekoder i utdata (standard)\n"
-#~ "  -E, --escape                   bruk C-escapekoder i utdata, ingen utvidede tegn\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatorisk for korte "
+#~ "flagg.\n"
+#~ "  -d, --default-domain=NAVN      bruk NAVN.po som resultatfil (istedet "
+#~ "for messages.po)\n"
+#~ "  -D, --directory=KATALOG        legge til KATALOG til søkelisten for "
+#~ "innfiler\n"
+#~ "  -e, --no-escape                ikke bruk C-escapekoder i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   bruk C-escapekoder i utdata, ingen "
+#~ "utvidede tegn\n"
 #~ "  -f, --files-from=FIL           hent liste av innfiler fra FIL\n"
 #~ "      --force-po                 skriv PO-fil selv om den vil bli tom\n"
 #~ "  -F, --sort-by-file             sorter utdata etter fillokasjon\n"
@@ -1258,24 +1456,32 @@ msgstr ""
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "  -i, --indent                   skrive ut .po-filen med innrykk\n"
 #~ "      --no-location              ikke skriv «#: filnavn:linje»-linjer\n"
-#~ "  -n, --add-location             genererer «#: filnavn:linje»-linjer (standard)\n"
+#~ "  -n, --add-location             genererer «#: filnavn:linje»-linjer "
+#~ "(standard)\n"
 #~ "      --omit-header              ikke skriv hode med «msgid »\n"
 #~ "  -o, --output=FIL               skriv utdata til angitt FIL\n"
 #~ "  -p, --output-dir=KAT           utfiler plasseres i katalogen KAT\n"
-#~ "  -s, --sort-output              generer sortert utdata og fjern duplikater\n"
-#~ "      --strict                   skriv ut streng Uniforum-konform .po-fil\n"
+#~ "  -s, --sort-output              generer sortert utdata og fjern "
+#~ "duplikater\n"
+#~ "      --strict                   skriv ut streng Uniforum-konform .po-"
+#~ "fil\n"
 #~ "  -T, --trigraphs                forstå ANSI C trigraphs i inndata\n"
 #~ "  -u, --unique                   kortform --less-than=2, krever\n"
 #~ "                                 at bare unike meldinger blir skrevet ut\n"
@@ -1285,12 +1491,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -1305,13 +1515,16 @@ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] filnavn.po ...\n"
 #~ "Lage binær meldingskatalog fra tekstbasert beskrivelse.\n"
 #~ "\n"
-#~ "Obligatoriske argumenter for lange flagg er også obligatoriske for korte flagg.\n"
-#~ "  -a, --alignment=ANTALL      juster strengene til ANTALL byter (standard: %d)\n"
+#~ "Obligatoriske argumenter for lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
+#~ "  -a, --alignment=ANTALL      juster strengene til ANTALL byter "
+#~ "(standard: %d)\n"
 #~ "  -c, --check                 utfør språkavhengige tester på strengene\n"
 #~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten for innfiler\n"
 #~ "  -f, --use-fuzzy             bruk antatte linjer i utdata\n"
 #~ "  -h, --help                  vis denne hjelpeteksten og avslutt\n"
-#~ "      --no-hash               binær vil ikke bli inkludert i hash-tabellen\n"
+#~ "      --no-hash               binær vil ikke bli inkludert i hash-"
+#~ "tabellen\n"
 #~ "  -o, --output-file=FIL       angi FIL som filnavn for utdata\n"
 #~ "      --statistics            skrive ut statistikk om oversettelsene\n"
 #~ "      --strict                lag streng Uniforum-konform .po-fil\n"
@@ -1320,7 +1533,8 @@ msgstr ""
 #~ "\n"
 #~ "Dersom -v-flagget blir gitt flere ganger, gis mer fyldige meldinger.\n"
 #~ "\n"
-#~ "Dersom innfil er -, vil inndata bli lest fra standard inn.  Dersom utfil er -,\n"
+#~ "Dersom innfil er -, vil inndata bli lest fra standard inn.  Dersom utfil "
+#~ "er -,\n"
 #~ "vil utdata bli skrevet til standard ut.\n"
 
 #~ msgid ""
@@ -1345,65 +1559,97 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Bruksmåte: %s [FLAGG] INNFIL ...\n"
 #~ "Ekstrahere oversettbare strenger fra angitte innfiler.\n"
 #~ "\n"
-#~ "Obligatoriske argumenter for lange flagg er også obligatoriske for korte flagg.\n"
+#~ "Obligatoriske argumenter for lange flagg er også obligatoriske for korte "
+#~ "flagg.\n"
 #~ "  -a, --extract-all              ekstrahere alle strengene\n"
-#~ "  -c, --add-comments[=TAG]       lagre kommentarblokker med TAG (eller kommentarer\n"
-#~ "                                 i linjer som kommer foran nøkkelord) i utfilen\n"
+#~ "  -c, --add-comments[=TAG]       lagre kommentarblokker med TAG (eller "
+#~ "kommentarer\n"
+#~ "                                 i linjer som kommer foran nøkkelord) i "
+#~ "utfilen\n"
 #~ "  -C, --c++                      kortform for --language=C++\n"
-#~ "      --debug                    mer detaljert resultat fra gjenkjenning av formatstreng\n"
-#~ "  -d, --default-domain=NAVN      bruk NAVN.po for utdata (istedet for messages.po)\n"
-#~ "  -D, --directory=KATALOG        legg KATALOG til søkelisten for innfiler\n"
-#~ "  -e, --no-escape                ikke bruk C-escapesekvenser i utdata (standard)\n"
-#~ "  -E, --escape                   bruke C-escapekoder i utdata, ingen utvidede tegn\n"
+#~ "      --debug                    mer detaljert resultat fra gjenkjenning "
+#~ "av formatstreng\n"
+#~ "  -d, --default-domain=NAVN      bruk NAVN.po for utdata (istedet for "
+#~ "messages.po)\n"
+#~ "  -D, --directory=KATALOG        legg KATALOG til søkelisten for "
+#~ "innfiler\n"
+#~ "  -e, --no-escape                ikke bruk C-escapesekvenser i utdata "
+#~ "(standard)\n"
+#~ "  -E, --escape                   bruke C-escapekoder i utdata, ingen "
+#~ "utvidede tegn\n"
 #~ "  -f, --files-from=FIL           hent liste over innfiler fra FIL\n"
 #~ "      --force-po                 skriv ut PO-fil selv om den vil bli tom\n"
-#~ "      --foreign-user             utelat FSF-copyright i utdata for fremmede brukere\n"
+#~ "      --foreign-user             utelat FSF-copyright i utdata for "
+#~ "fremmede brukere\n"
 #~ "  -F, --sort-by-file             sorter utdata etter fillokasjon\n"
 
 #~ msgid ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                     vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                   skrive .po-filen med innrykk\n"
 #~ "  -j, --join-existing            flett meldinger med eksisterende fil\n"
-#~ "  -k, --keyword[=ORD]            ytterligere nøkkelord for bruk i søk (mangler\n"
-#~ "                                 ORD skal heller ikke standard nøkkelord brukes)\n"
-#~ "  -l, --string-limit=ANTALL      sett begrensning på strenglengde til ANTALL istedet for %u\n"
-#~ "  -L, --language=NAVN            gjenkjenn det angitt språket (C, C++, PO),\n"
-#~ "                                 ellers blir det gjettet fra filutvidelsen\n"
-#~ "  -m, --msgstr-prefix[=STRENG]   bruk STRENG eller «» som prefiks for msgstr-innslag\n"
-#~ "  -M, --msgstr-suffix[=STRENG]   bruk STRENG eller «» som suffiks for msgstr-innslag\n"
+#~ "  -k, --keyword[=ORD]            ytterligere nøkkelord for bruk i søk "
+#~ "(mangler\n"
+#~ "                                 ORD skal heller ikke standard nøkkelord "
+#~ "brukes)\n"
+#~ "  -l, --string-limit=ANTALL      sett begrensning på strenglengde til "
+#~ "ANTALL istedet for %u\n"
+#~ "  -L, --language=NAVN            gjenkjenn det angitt språket (C, C++, "
+#~ "PO),\n"
+#~ "                                 ellers blir det gjettet fra "
+#~ "filutvidelsen\n"
+#~ "  -m, --msgstr-prefix[=STRENG]   bruk STRENG eller «» som prefiks for "
+#~ "msgstr-innslag\n"
+#~ "  -M, --msgstr-suffix[=STRENG]   bruk STRENG eller «» som suffiks for "
+#~ "msgstr-innslag\n"
 #~ "      --no-location              ikke skriv ut «#: filnavn:linje»-linjer\n"
 
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -1411,7 +1657,8 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             generer «#: filnavn:linje»-linjer (standard)\n"
+#~ "  -n, --add-location             generer «#: filnavn:linje»-linjer "
+#~ "(standard)\n"
 #~ "      --omit-header              ikke skriv hode med «msgid »-innslag\n"
 #~ "  -o, --output=FIL               skriv utdata til FIL\n"
 #~ "  -p, --output-dir=KAT           skriv ut filene til katalogen KAT\n"
diff --git a/gettext-runtime/po/nl.po b/gettext-runtime/po/nl.po
index 5ee9aa905..5504b056f 100644
--- a/gettext-runtime/po/nl.po
+++ b/gettext-runtime/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-07-01 21:01+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -26,81 +27,65 @@ msgstr ""
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: onbekende optie '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: optie '--%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: onbekende optie '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: onbekende optie '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: optie '-W %s' is niet eenduidig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '-W %s' vereist een argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -109,7 +94,7 @@ msgstr ""
 "Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
@@ -119,57 +104,57 @@ msgstr "Geschreven door %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "ontbrekende argumenten"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Gebruik:  %s [OPTIE] [SHELL-OPMAAK]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Vervangt de waarden van omgevingsvariabelen.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables     de variabelen die voorkomen in SHELL-OPMAAK tonen\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version       programmaversie tonen en stoppen\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -186,7 +171,7 @@ msgstr ""
 "waarnaar verwezen wordt in SHELL-OPMAAK; anders worden alle verwijzingen\n"
 "naar omgevingsvariabelen die in standaardinvoer voorkomen vervangen.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -200,27 +185,27 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
 "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standaardinvoer"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -229,32 +214,56 @@ msgstr ""
 "Gebruik:  %s [OPTIE] [[TEKSTDOMEIN] MSGID]\n"
 "     of:  %s [OPTIE] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Toont de vertaling van een tekstbericht.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMEIN  vertalingen opzoeken in TEKSTDOMEIN\n"
-"  -e                        sommige stuurcodereeksen interpreteren\n"
-"  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
-"  -h, --help                deze hulptekst tonen en stoppen\n"
-"  -n                        afsluitend regeleindeteken onderdrukken\n"
-"  -V, --version             programmaversie tonen en stoppen\n"
-"  [TEKSTDOMEIN] MSGID       vertaling van MSGID opzoeken (in TEKSTDOMEIN)\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version       programmaversie tonen en stoppen\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -276,12 +285,12 @@ msgstr ""
 "in de gekozen catalogus gevonden worden.\n"
 "De standaard zoekmap is: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Gebruik:  %s [OPTIE] [TEKSTDOMEIN] MSGID MSGID-MEERVOUD AANTAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -290,28 +299,31 @@ msgstr ""
 "Toont de vertaling van een tekstbericht waarvan de grammaticale vorm\n"
 "afhangt van een getal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMEIN  vertalingen opzoeken in TEKSTDOMEIN\n"
-"  -e                        sommige stuurcodereeksen interpreteren\n"
-"  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
-"  -h, --help                deze hulptekst tonen en stoppen\n"
-"  -V, --version             programmaversie tonen en stoppen\n"
-"  [TEKSTDOMEIN]             vertaald bericht opzoeken in TEKSTDOMEIN\n"
-"  MSGID MSGID-MEERVOUD      MSGID (enkelvoud) en MSGID-MEERVOUD vertalen\n"
-"  AANTAL                    enkel- of meervoud kiezen gebaseerd op deze waarde\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -325,3 +337,62 @@ msgstr ""
 "wordt in de gewone map, kan een andere locatie worden opgegeven via de\n"
 "omgevingsvariabele TEXTDOMAINDIR.\n"
 "De standaard zoekmap is: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: optie '--%s' staat geen argument toe\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: onbekende optie '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: optie '-W %s' is niet eenduidig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: optie '-W %s' staat geen argument toe\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: optie '-W %s' vereist een argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMEIN  vertalingen opzoeken in TEKSTDOMEIN\n"
+#~ "  -e                        sommige stuurcodereeksen interpreteren\n"
+#~ "  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
+#~ "  -h, --help                deze hulptekst tonen en stoppen\n"
+#~ "  -n                        afsluitend regeleindeteken onderdrukken\n"
+#~ "  -V, --version             programmaversie tonen en stoppen\n"
+#~ "  [TEKSTDOMEIN] MSGID       vertaling van MSGID opzoeken (in TEKSTDOMEIN)\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTDOMEIN  vertalingen opzoeken in TEKSTDOMEIN\n"
+#~ "  -e                        sommige stuurcodereeksen interpreteren\n"
+#~ "  -E                        (genegeerd, maar herkend wegens compatibiliteit)\n"
+#~ "  -h, --help                deze hulptekst tonen en stoppen\n"
+#~ "  -V, --version             programmaversie tonen en stoppen\n"
+#~ "  [TEKSTDOMEIN]             vertaald bericht opzoeken in TEKSTDOMEIN\n"
+#~ "  MSGID MSGID-MEERVOUD      MSGID (enkelvoud) en MSGID-MEERVOUD vertalen\n"
+#~ "  AANTAL                    enkel- of meervoud kiezen gebaseerd op deze waarde\n"
diff --git a/gettext-runtime/po/nn.po b/gettext-runtime/po/nn.po
index 0ebcd503e..e3f547e58 100644
--- 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: 2007-10-07 23:09+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
@@ -23,77 +24,67 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefeil"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: Valet «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Valet «--%s» tek ikkje argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Valet «%s» er fleirtydig\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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: Ukjent val – «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: Valet «%c%s» tek ikkje 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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: Valet «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: Ukjent val – «--%s»\n"
-
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: Ukjent val – «%c%s»\n"
-
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: Ulovleg val – %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Ugyldig val – %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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Valet treng eit argument – %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Valet «-W %s» er fleirtydig\n"
-
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Valet «-W %s» tek ikkje argument\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "gjekk tom for minne"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -102,7 +93,7 @@ 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/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrive av %s.\n"
@@ -112,57 +103,58 @@ msgstr "Skrive av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argument"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "manglar argument"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Bruk: %s [VAL] [SKALTYPE]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Erstattar verdiane i miljøvariablar.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Handlingsmodus:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             vis variablane i SKALTYPE\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ vising:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  vis denne hjelpa og avslutt\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               vis informasjon om versjon og avslutt\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -178,7 +170,7 @@ msgstr ""
 "miljøvariablane det er referert til i «SKALTYPE» erstatta. Elles vil alle referansar\n"
 "til miljøvariablar som førekjem i standard inndata verta erstatta.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -191,25 +183,25 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil ved lesing av «%s»"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard inndata"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -218,40 +210,72 @@ msgstr ""
 "Bruk:  %s [VAL] [[TEKSTOMRÅDE] MSGID]\n"
 "eller: %s [VAL] -s [MSGID] …\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Vis omsetjinga av ein tekststreng.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTOMRÅDE  hent omsette meldingar frå TEKSTOMRÅDE\n"
-"  -e                        slå på utviding av nokre escape-sekvensar\n"
-"  -E                        (ignorert grunna kompatibilitetsomsyn)\n"
-"  -h, --help                vis denne hjelpa og avslutt\n"
-"  -n                        undertrykk etterfølgjande linjeskift\n"
-"  -V, --version             vis informasjon om versjon og avslutt\n"
-"  [TEKSTOMRÅDE] MSGID       hent omsett melding som stemmer overeins med\n"
-"                            MSGID frå «TEXTDOMAIN»\n"
-
-#: src/gettext.c:264
-#, c-format, no-wrap
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  vis denne hjelpa og avslutt\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               vis informasjon om versjon og avslutt\n"
+
+#: src/gettext.c:285
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#| "regular directory, another location can be specified with the environment\n"
+#| "variable TEXTDOMAINDIR.\n"
+#| "When used with the -s option the program behaves like the `echo' command.\n"
+#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#| "found in the selected catalog are translated.\n"
+#| "Standard search directory: %s\n"
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -265,41 +289,43 @@ msgstr ""
 "meldingar som er funne i den valde katalogen omsette.\n"
 "Standard søkjekatalog er: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Bruk: %s [VAL] [TEKSTOMRDE] MSGID MSGID-PLURAL TAL\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Vis omsetjinga av ein tekststreng som har ei grammatisk form som er avhengig av eit tal.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTOMRÅDE  hent omsette meldingar frå TEKSTOMRÅDE\n"
-"  -e                        slå på utviding av nokre escape-sekvensar\n"
-"  -E                        (ignorert grunna kompatibilitetsomsyn)\n"
-"  -h, --help                vis denne hjelpa og avslutt\n"
-"  -n                        undertrykk etterfølgjande linjeskift\n"
-"  -V, --version             vis informasjon om versjon og avslutt\n"
-"  [TEKSTOMRÅDE]             hent omsett melding frå «TEXTDOMAIN»\n"
-"  MSGID MSGID-PLURAL        omset MSGID (eintal) / MSGID-PLURAL (fleirtal)\n"
-"  TAL                       vel eintal-/fleirtalsform basert på denne verdien\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -314,8 +340,72 @@ msgstr ""
 "«TEXTDOMAIN».\n"
 "Standard søkjekatalog er: %s\n"
 
-#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Valet «--%s» tek ikkje argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: Ukjent val – «--%s»\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: Ulovleg val – %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: Valet «-W %s» er fleirtydig\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Valet «-W %s» tek ikkje argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTOMRÅDE  hent omsette meldingar frå TEKSTOMRÅDE\n"
+#~ "  -e                        slå på utviding av nokre escape-sekvensar\n"
+#~ "  -E                        (ignorert grunna kompatibilitetsomsyn)\n"
+#~ "  -h, --help                vis denne hjelpa og avslutt\n"
+#~ "  -n                        undertrykk etterfølgjande linjeskift\n"
+#~ "  -V, --version             vis informasjon om versjon og avslutt\n"
+#~ "  [TEKSTOMRÅDE] MSGID       hent omsett melding som stemmer overeins med\n"
+#~ "                            MSGID frå «TEXTDOMAIN»\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEKSTOMRÅDE  hent omsette meldingar frå TEKSTOMRÅDE\n"
+#~ "  -e                        slå på utviding av nokre escape-sekvensar\n"
+#~ "  -E                        (ignorert grunna kompatibilitetsomsyn)\n"
+#~ "  -h, --help                vis denne hjelpa og avslutt\n"
+#~ "  -n                        undertrykk etterfølgjande linjeskift\n"
+#~ "  -V, --version             vis informasjon om versjon og avslutt\n"
+#~ "  [TEKSTOMRÅDE]             hent omsett melding frå «TEXTDOMAIN»\n"
+#~ "  MSGID MSGID-PLURAL        omset MSGID (eintal) / MSGID-PLURAL (fleirtal)\n"
+#~ "  TAL                       vel eintal-/fleirtalsform basert på denne verdien\n"
+
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\"
+#~ "%c»"
 
 #~ msgid "cannot create output file \"%s\""
 #~ msgstr "kan ikkje opprette utfila \"%s\""
@@ -334,7 +424,8 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -h, --help                  display this help and exit\n"
 #~ "  -V, --version               output version information and exit\n"
 #~ "\n"
@@ -346,15 +437,19 @@ msgstr ""
 #~ "cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
 #~ "  -V, --version            vis programversjon og avslutt\n"
 #~ "\n"
-#~ "Samanliknar to Uniforum .po-filer for å sjekke at begge inneheld det samme\n"
+#~ "Samanliknar to Uniforum .po-filer for å sjekke at begge inneheld det "
+#~ "samme\n"
 #~ "settet msgid-strengar.  def.po-filen er ein eksisterende PO-fil med dei\n"
 #~ "gamle oversetjingane.  ref.po-filen er den sist genererte PO-fila\n"
-#~ "(vanligvis generert med xgettext).  Dette er nyttig for å sjekke at du har\n"
-#~ "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, vert\n"
+#~ "(vanligvis generert med xgettext).  Dette er nyttig for å sjekke at du "
+#~ "har\n"
+#~ "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, "
+#~ "vert\n"
 #~ "«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
 
 #~ msgid "this message is used but not defined..."
@@ -386,17 +481,22 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -a, --extract-all             ekstrahér alle strengar\n"
 #~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
 #~ "                                kommentarar i linjer som kjem foran\n"
@@ -405,8 +505,10 @@ msgstr ""
 #~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
 #~ "                                messages.po)\n"
 #~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
-#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
 #~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
 
@@ -414,18 +516,25 @@ msgstr ""
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
@@ -455,12 +564,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -473,8 +586,10 @@ msgstr ""
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] filnavn.po ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
-#~ "  -a, --alignment=ANTALL    justér strengar til ANTALL bytes (forvalgt: %d)\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -a, --alignment=ANTALL    justér strengar til ANTALL bytes (forvalgt: "
+#~ "%d)\n"
 #~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
 #~ "      --no-hash             binærfil skal ikkje innehalde hash-tabell\n"
 #~ "  -o, --output-file=FILNAVN sett utfil til FILNAVN\n"
@@ -482,7 +597,8 @@ msgstr ""
 #~ "  -v, --verbose             list alle avvik i innfil\n"
 #~ "  -V, --version             vis programversjon og avslutt\n"
 #~ "\n"
-#~ "Dersom innfil er -, vil inndata verte lest frå standard inn.  Dersom utfil\n"
+#~ "Dersom innfil er -, vil inndata verte lest frå standard inn.  Dersom "
+#~ "utfil\n"
 #~ "er -, vil utdata verte skrive til standard ut.\n"
 
 #~ msgid "while creating hash table"
@@ -522,8 +638,11 @@ msgstr ""
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 #~ msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#~ msgid "number of format specifications in `msgid' and `msgstr' does not match"
-#~ msgstr "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
+#~ msgid ""
+#~ "number of format specifications in `msgid' and `msgstr' does not match"
+#~ msgstr ""
+#~ "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
+#~ "overeins"
 
 #~ msgid "format specifications for argument %u are not the same"
 #~ msgstr "format-spesifiseringane for argument %u er ulike"
@@ -532,7 +651,8 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -e, --no-escape             do not use C escapes in output (default)\n"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
@@ -540,16 +660,19 @@ msgstr ""
 #~ "  -i, --indent                indented output style\n"
 #~ "  -o, --output-file=FILE      result will be written to FILE\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ "  -V, --version               output version information and exit\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
 #~ "  -i, --indent             indentert utdata\n"
 #~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
@@ -571,18 +694,25 @@ msgstr ""
 #~ "\n"
 #~ "Fletter saman to Uniforum .po-filer.  def.po-filen er ei eksisterande\n"
 #~ "PO-fil med gamle oversetjingar, som vil verte overført til den nye fila\n"
-#~ "dersom dei framleis stemmer.  Kommentarar vert teke med, men kommentarer om\n"
-#~ "sjølve ekstraheringa og fil-posisjoner vert sletta.  ref.po-filen er den\n"
+#~ "dersom dei framleis stemmer.  Kommentarar vert teke med, men kommentarer "
+#~ "om\n"
+#~ "sjølve ekstraheringa og fil-posisjoner vert sletta.  ref.po-filen er "
+#~ "den\n"
 #~ "sist genererte PO-fila (vanlegvis generert med xgettext).  Oversetjingar\n"
 #~ "eller kommentarer i denne fila vert sletta, men punktum-kommentarer og\n"
 #~ "fil-posisjonar vert teke vare på.  Der det ikkje er mogleg å finne ei\n"
-#~ "eksakt overeinsstemming, vert «fuzzy» samanlikning brukt for å få betre\n"
-#~ "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
+#~ "eksakt overeinsstemming, vert «fuzzy» samanlikning brukt for å få "
+#~ "betre\n"
+#~ "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil "
+#~ "er\n"
 #~ "spesifisert.\n"
 
-#~ msgid "%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %d.\n"
+#~ msgid ""
+#~ "%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
+#~ "%d.\n"
 #~ msgstr ""
-#~ "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
+#~ "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar "
+#~ "%d,\n"
 #~ "utdaterte %d.\n"
 
 #, fuzzy
@@ -594,7 +724,8 @@ msgstr ""
 #~ "      --force-po           write PO file even if empty\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
@@ -605,7 +736,8 @@ msgstr ""
 #~ "  -E, --escape             use C escapes in output, no extended chars\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 
@@ -618,8 +750,10 @@ msgstr ""
 #~ "By default the output is written to standard output.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Konverter binære .mo-filer til Uniforum .po-filer.  Både «little-endian» og\n"
-#~ "«big-endian» .mo filer vert håndtert.  Dersom innfil er -, blir standard\n"
+#~ "Konverter binære .mo-filer til Uniforum .po-filer.  Både «little-"
+#~ "endian» og\n"
+#~ "«big-endian» .mo filer vert håndtert.  Dersom innfil er -, blir "
+#~ "standard\n"
 #~ "inn lest.  Dersom utfil er -, vert det skrive til standard ut.\n"
 
 #~ msgid "file \"%s\" truncated"
@@ -643,7 +777,8 @@ msgstr ""
 #~ msgstr "for mange feil, avsluttar"
 
 #~ 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"
+#~ msgstr ""
+#~ "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
 #, fuzzy
 #~ msgid ""
@@ -655,18 +790,25 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -a, --extract-all             ekstrahér alle strengar\n"
 #~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
 #~ "                                kommentarar i linjer som kjem foran\n"
@@ -675,8 +817,10 @@ msgstr ""
 #~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
 #~ "                                messages.po)\n"
 #~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
-#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
 #~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
 
@@ -685,20 +829,29 @@ msgstr ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
+#~ "instead %u\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                    vis denne hjelpeteksta og avslutt\n"
 #~ "  -i, --indent                  lag indentert utdata\n"
-#~ "  -j, --join-existing           flett saman meldingar med eksisterande fil\n"
-#~ "  -k, --keyword[=ORD]           sjå også etter nøkkelordet ORD (manglar ORD,\n"
-#~ "                                skal ikkje dei vanlege nøkkelorda nyttast)\n"
+#~ "  -j, --join-existing           flett saman meldingar med eksisterande "
+#~ "fil\n"
+#~ "  -k, --keyword[=ORD]           sjå også etter nøkkelordet ORD "
+#~ "(manglar ORD,\n"
+#~ "                                skal ikkje dei vanlege nøkkelorda "
+#~ "nyttast)\n"
 #~ "  -l, --string-limit=NUMMER     sett største streng-lengde til NUMMER\n"
 #~ "                                i staden for %u\n"
 #~ "  -m, --msgstr-prefix[=STRENG]  bruk STRENG eller \"\" som prefiks for\n"
@@ -709,12 +862,17 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -722,8 +880,10 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
diff --git a/gettext-runtime/po/pl.po b/gettext-runtime/po/pl.po
index dba9dc4b4..0a91fb235 100644
--- a/gettext-runtime/po/pl.po
+++ b/gettext-runtime/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-07-15 18:54+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -16,87 +16,73 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 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 "błąd zapisu"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: opcja „%s” jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nierozpoznana opcja „%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: opcja „%c%s” nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: opcja „--%s” wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nierozpoznana opcja „--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nierozpoznana opcja „%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: błędna opcja -- „%c”\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga argumentu -- „%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcja „-W %s” wymaga argumentu\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -105,7 +91,7 @@ msgstr ""
 "To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
 "Autorzy NIE DAJĄ GWARANCJI, na ile pozwala na to prawo.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor programu: %s.\n"
@@ -115,57 +101,57 @@ msgstr "Autor programu: %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "za dużo argumentów"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "brakujące argumenty"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Składnia: %s [OPCJA] [FORMAT-POWŁOKI]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Podstawia wartości zmiennych powłoki.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Tryb działania:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             wypisanie zmiennych z FORMATU-POWŁOKI\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informacje:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, 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/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               wyświetlenie informacji o wersji i zakończenie\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -181,7 +167,7 @@ msgstr ""
 "zastępowane są tylko zmienne tam wymienione. W przeciwnym wypadku podstawiane\n"
 "są wartości wszystkich zmiennych środowiska podanych na standardowym wejściu.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -195,25 +181,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporty o błędach wysyłaj do bug-gnu-gettext@gnu.org\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "błąd podczas czytania \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standardowe wejście"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -222,33 +208,58 @@ msgstr ""
 "Składnia: %s [OPCJA] [[DOMENA] MSGID]\n"
 "    albo: %s [OPCJA] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Wyświetla tłumaczenie komunikatu.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMENA       wydobycie przetłumaczonych komunikatów z DOMENY\n"
-"  -e                        rozwijanie niektórych sekwencji escape\n"
-"  -E                        (ignorowane, dla kompatybilności)\n"
-"  -h, --help                wyświetlenie tego opisu i zakończenie\n"
-"  -n                        wyłączenie końcowego znaku nowej linii\n"
-"  -V, --version             wyświetlenie informacji o wersji i zakończenie\n"
-"  [DOMENA] MSGID            wydobycie z DOMENY przetłumaczonego komunikatu\n"
-"                            odpowiadającego MSGID\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  wyświetlenie tego opisu i zakończenie\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               wyświetlenie informacji o wersji i "
+"zakończenie\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -269,41 +280,43 @@ msgstr ""
 "znalezione w wybranym katalogu.\n"
 "Domyślnie przeszukiwany katalog: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Składnia: %s [OPCJA] [DOMENA] MSGID MSGID-MNOGA ILOŚĆ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Wyświetlenie tłumaczenia komunikatu, którego forma gramatyczna zależy od liczby\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMENA       wydobycie przetłumaczonych komunikatów z DOMENY\n"
-"  -e                        włączenie rozwijania niektórych sekwencji escape\n"
-"  -E                        (ignorowane, dla kompatybilności)\n"
-"  -h, --help                wyświetlenie tego opisu i zakończenie\n"
-"  -n                        wyłączenie końcowego znaku nowej linii\n"
-"  -V, --version             wyświetlenie informacji o wersji i zakończenie\n"
-"  [DOMENA]                  wydobycie z DOMENA przetłumaczonego komunikatu\n"
-"  MSGID MSGID-MNOGA         przetłumaczenie MSGID (pojed.) / MSGID-MNOGA (mn.)\n"
-"  LICZBA                    wybranie formy pojed./mn. w oparciu o LICZBĘ\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,3 +330,64 @@ msgstr ""
 "znaleziony w domyślnym katalogu, inna lokalizacja może być podana przez\n"
 "zmienną środowiskową TEXTDOMAINDIR.\n"
 "Domyślnie przeszukiwany katalog: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja „--%s” nie może mieć argumentu\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: nierozpoznana opcja „--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: opcja „-W %s” wymaga argumentu\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENA       wydobycie przetłumaczonych komunikatów z DOMENY\n"
+#~ "  -e                        rozwijanie niektórych sekwencji escape\n"
+#~ "  -E                        (ignorowane, dla kompatybilności)\n"
+#~ "  -h, --help                wyświetlenie tego opisu i zakończenie\n"
+#~ "  -n                        wyłączenie końcowego znaku nowej linii\n"
+#~ "  -V, --version             wyświetlenie informacji o wersji i zakończenie\n"
+#~ "  [DOMENA] MSGID            wydobycie z DOMENY przetłumaczonego komunikatu\n"
+#~ "                            odpowiadającego MSGID\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENA       wydobycie przetłumaczonych komunikatów z DOMENY\n"
+#~ "  -e                        włączenie rozwijania niektórych sekwencji escape\n"
+#~ "  -E                        (ignorowane, dla kompatybilności)\n"
+#~ "  -h, --help                wyświetlenie tego opisu i zakończenie\n"
+#~ "  -n                        wyłączenie końcowego znaku nowej linii\n"
+#~ "  -V, --version             wyświetlenie informacji o wersji i zakończenie\n"
+#~ "  [DOMENA]                  wydobycie z DOMENA przetłumaczonego komunikatu\n"
+#~ "  MSGID MSGID-MNOGA         przetłumaczenie MSGID (pojed.) / MSGID-MNOGA (mn.)\n"
+#~ "  LICZBA                    wybranie formy pojed./mn. w oparciu o LICZBĘ\n"
diff --git a/gettext-runtime/po/pt.po b/gettext-runtime/po/pt.po
index a988e8cb6..f9220cb4e 100644
--- a/gettext-runtime/po/pt.po
+++ b/gettext-runtime/po/pt.po
@@ -1,105 +1,98 @@
 # Portuguese translation of the "gettext" messages
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 2018 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
 # Nuno Oliveira <nuno@eq.uc.pt>, 1996.
 # Helder Correia <helder.pereira.correia@gmail.com>, 2005-2007.
+# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-07 23:09+0200\n"
-"PO-Revision-Date: 2007-12-09 18:24+0100\n"
-"Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-10-04 10:44+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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"
-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"
-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"
-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"
-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"
-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"
-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"
-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"
-msgstr "%s: opção requere um argumento -- %c\n"
-
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+msgstr "Erro de sistema desconhecido"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a opção \"%s\" é ambígua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opção não reconhecida \"%c%s\"\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: a opção \"%c%s\" não permite um argumento\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: a opção \"--%s\" requer um argumento\n"
+
+#: gnulib-lib/getopt.c:621
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: a opção '-W %s' é ambígua\n"
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opção inválida -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, 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"
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: a opção requer um argumento -- \"%c\"\n"
 
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
-msgstr "memória esgotada"
-
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+msgstr "Memória esgotada"
+
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licança GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"Este software é livre: pode alterá-lo e redistribuí-lo.\n"
-"NÃO HÁ QUALQUER GARANTIA, até onde a lei o permite.\n"
+"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
+"Este software é grátis: pode alterá-lo e redistribuí-lo.\n"
+"Não há QUALQUER GARANTIA, até ao limite da Lei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -109,57 +102,57 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
-msgstr "argumentos insuficientes"
+msgstr "argumentos em falta"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Tente '%s --help' para mais informação.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente \"%s --help\" para mais informação.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Utilização: %s [OPÇÃO] [FORMATO-SHELL]\n"
+msgstr "Uso: %s [OPÇÃO] [FORMATO-SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substitui os valores das variáveis de ambiente.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Modo de operação:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             exibir as variáveis ocorrentes em FORMATO-SHELL\n"
+msgstr "  -v, --variables             mostra as variáveis em FORMATO-SHELL\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  exibir esta ajuda e sair\n"
+msgstr "  -h, --help                  mostra esta mensagem e sai\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               exibir informação de versão e sair\n"
+msgstr "  -V, --version               mostra informação da versão e sai\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -169,14 +162,14 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"No modo de operação normal, a entrada padrão é copiada para a saída padrão,\n"
+"Em modo de operação normal, a entrada padrão é copiada para a saída padrão,\n"
 "com referências a variáveis de ambiente da forma $VARIÁVEL ou ${VARIÁVEL}\n"
 "sendo substituídas com os valores correspondentes. Se um FORMATO-SHELL for\n"
 "dado, apenas essas variáveis de ambiente referenciadas em FORMATO-SHELL são\n"
 "substituídas; caso contrário, todas as variáveis de ambiente referenciadas\n"
 "ocorrentes na entrada padrão são substituídas.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -189,117 +182,144 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Reporte erros para <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Reporte erros a <bug-gnu-gettext@gnu.org>.\n"
+"Reporte erros de tradução a <translation-team-pt@lists.sourceforge.net>\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
+msgstr "erro ao ler \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
-msgstr "entrada standard"
+msgstr "entrada padrão"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Utilização: %s [OPÇÃO] [[DIALECTO] MSGID]\n"
-"ou:         %s [OPÇÃO] -s [MSGID]...\n"
+"Uso: %s [OPÇÃO] [[DIALECTO] MSGID]\n"
+"ou:  %s [OPÇÃO] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Exibir tradução de língua nativa de uma mensagem textual.\n"
+msgstr "Mostrar tradução de idioma nativo de uma mensagem textual.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-" -d, --domain=DIALECTO      obtém as mensagems traduzidas do DIALECTO\n"
-" -e                         activar expansão de algumas sequências de escape\n"
-" -E                         (ignorado para compatibilidade)\n"
-" -h, --help                 exibir esta ajuda e sair\n"
-" -n                         suprimir o carácter de nova linha final\n"
-" -V, --version              exibir informação de versão e sair\n"
-" [DIALECTO] MSGID           obter a mensagem traduzida correspondente a\n"
-"                            MSGID do DIALECTO\n"
-
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  mostra esta mensagem e sai\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               mostra informação da versão e sai\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
 "Se o parâmetro DIALECTO não for fornecido, o domínio é determinado a\n"
-"partir da variável TEXTDOMAIN do ambiente. Se o catálogo de mensagens\n"
-"não for encontrado na pasta regular, pode ser especificada outra\n"
-"localização através da variável TEXTDOMAINDIR do ambiente.\n"
-"Quando usado com a opção -s, o programa comporta-se como o comando\n"
-"'echo'. Contudo ele não copia simplesmente os seus argumentos para a\n"
-"saída padrão. Ao invés, as mensagens encontradas no catálogo seleccionado\n"
-"são traduzidas.\n"
+"partir da variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens\n"
+"não for encontrado na pasta habitual, pode ser especificada outra\n"
+"localização através da variável de ambiente TEXTDOMAINDIR.\n"
+"Quando usado com a opção -s, o programa comporta-se como o comando \"echo\".\n"
+"Mas ele não copia simplesmente os seus argumentos para a saída padrão.\n"
+"Ao invés, as mensagens encontradas no catálogo seleccionado são traduzidas.\n"
 "Pasta padrão de pesquisa: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Utilização: %s [OPÇÃO] [DIALECTO] MSGID MSGID-PLURAL NÚMERO\n"
+msgstr "Uso: %s [OPÇÃO] [DIALECTO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Exibir tradução de língua nativa de uma mensagem textual cujas formas\n"
-"gramaticais dependem de um número.\n"
+"Mostrar tradução de idioma nativo de uma mensagem textual cuja forma\n"
+"gramatical depende de um número.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-" -d, --domain=DIALECTO      obter as mensagems traduzidas do DIALECTO\n"
-" -e                         activar expansão de algumas sequências de escape\n"
-" -E                         (ignorado para compatibilidade)\n"
-" -h, --help                 exibir esta ajuda e sair\n"
-" -V, --version              exibir a informação de versão e sair\n"
-" [DIALECTO]                 obter a mensagem traduzida do DIALECTO\n"
-" MSGID MSGID-PLURAL         traduzir MSGID (singular) / MSGID.PLURAL (plural)\n"
-" NÚMERO                     escolher forma singular/plural baseado neste valor\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -308,12 +328,71 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Se o parâmetro DIALECTO não for fornecido, o domínio é determinado a\n"
-"partir da variável TEXTDOMAIN do ambiente. Se o catálogo de mensagens\n"
-"não for encontrado na pasta regular, pode ser especificada outra\n"
-"localização através da variável TEXTDOMAINDIR do ambiente.\n"
-"Quando usado com a opção -s, o programa comporta-se como o comando\n"
-"`echo'. Contudo ele não copia simplesmente os seus argumentos para o\n"
-"stdout. Em vez disso as mensagens encontradas no catálogo seleccionado\n"
-"são traduzidas.\n"
+"Se o parâmetro DIALECTO não for fornecido, o domínio é determinado a partir\n"
+"da variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for\n"
+"encontrado na pasta habitual, pode ser especificada outra localização através\n"
+"da variável de ambiente TEXTDOMAINDIR.\n"
 "Pasta padrão de pesquisa: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção \"--%s\" não permite um argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opção não reconhecida \"--%s\"\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: a opção \"-W %s\" é ambígua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" não permite argumentos\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" requer um argumento\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ " -d, --domain=DIALECTO      obtém as mensagens traduzidas do DIALECTO\n"
+#~ " -e                         activa expansão de algumas sequências de escape\n"
+#~ " -E                         (ignorado para compatibilidade)\n"
+#~ " -h, --help                 mostra esta mensagem e sair\n"
+#~ " -n                         suprime o carácter de nova linha final\n"
+#~ " -V, --version              mostra informação de versão e sai\n"
+#~ " [DIALECTO] MSGID           obtém a mensagem traduzida correspondente a\n"
+#~ "                            MSGID do DIALECTO\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ " -d, --domain=DIALECTO      obtém as mensagens traduzidas do DIALECTO\n"
+#~ " -e                         activa expansão de algumas sequências de escape\n"
+#~ " -E                         (ignorado para compatibilidade)\n"
+#~ " -h, --help                 mostra esta mensagem e sai\n"
+#~ " -V, --version              mostra informação de versão e sai\n"
+#~ " [DIALECTO]                 obtém a mensagem traduzida do DIALECTO\n"
+#~ " MSGID MSGID-PLURAL         traduz MSGID (singular)/MSGID.PLURAL (plural)\n"
+#~ " NÚMERO                     escolhe a forma singular/plural baseado neste valor\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 84dbf6b1d..804d17086 100644
--- a/gettext-runtime/po/pt_BR.po
+++ b/gettext-runtime/po/pt_BR.po
@@ -1,114 +1,101 @@
-# Brazilian Portuguese translation of gettext-runtime
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Brazilian Portuguese translations for gettext-runtime
+# Traduções em português brasileiro para o gettext-runtime
+# Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Sandro Nunes Henrique <sandro@conectiva.com.br>, 1998
 # Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
 # Flávio Bruno Leitner <flavio@conectiva.com.br>, 2001.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2015.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2015, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2015-09-15 11:27-0300\n"
-"Last-Translator: Rafael Ferreira <rffontenelle@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-01-19 06:30-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+"net>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.11\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
-msgstr "Erro de sistema desconhecido"
-
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "Erro desconhecido de sistema"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a opção \"%s\" é ambígua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
 
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: opção \"%s\" é ambígua\n"
-
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opção \"--%s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opção \"%c%s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opção \"--%s\" requer um argumento\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opção não reconhecida \"--%s\"\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opção não reconhecida \"%c%s\"\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opção desconhecida \"%c%s\"\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: a opção \"%c%s\" não permite um argumento\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: a opção \"--%s\" exige um argumento\n"
+
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opção requer um argumento -- \"%c\"\n"
-
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opção \"-W %s\" é ambígua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opção \"-W %s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opção \"-W %s\" requer um argumento\n"
+msgstr "%s: a opção exige um argumento -- \"%c\"\n"
 
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
-msgstr "Memória insuficiente"
-
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+msgstr "memória esgotada"
+
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"Este é  um software livre: você é livre para alterar e redistribui-lo.\n"
-"NÃO HÁ GARANTIA, à extensão permitida pela lei.\n"
+"Este é um software livre: você é livre para alterá-lo e redistribui-lo.\n"
+"NÃO HÁ QUALQUER GARANTIA, na máxima extensão permitida em lei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -118,57 +105,57 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
-msgstr "excesso de parâmetros"
+msgstr "número excessivo de argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
-msgstr "parâmetros não informados"
+msgstr "faltando argumentos"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente \"%s --help\" para mais informações.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Uso: %s [OPÇÃO] [FORMATO SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substitui os valores das variáveis de ambiente.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Modo de operação:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             exibe as variáveis ocorrentes em SHELL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  exibe essa ajuda e sai\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               exibe a informação da versão e sai\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -185,7 +172,7 @@ msgstr ""
 "são substituídas. Do contrário, todas as referências variáveis de ambiente\n"
 "ocorrentes na entrada padrão são substituídas.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -194,32 +181,32 @@ msgstr ""
 "Quando --variables é usado, a entrada padrão é ignorada e a saída conste nas\n"
 "variáveis de ambiente que são referenciadas em FORMATO-SHELL, um por linha.\n"
 
-# Outra linha adicionada com email da equipe de tradução, seguindo requisição do desenvolvedor.
+# Adicionado endereço de email da equipe, conforme solicitação do desenvolvedor -- Rafael
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
 "Relate erros de tradução para <ldpbr-translation@lists.sourceforge.net>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "entrada padrão"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -228,33 +215,56 @@ msgstr ""
 "Uso: %s [OPÇÃO] [[DOMÍNIO] MSGID]\n"
 "ou:  %s [OPÇÃO] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Exibe tradução do idioma nativo de uma mensagem textual.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-"  -e                        habilita expansão de alguns caracteres de escape\n"
-"  -E                        (ignorado para compatibilidade)\n"
-"  -h, --help                exibe esta ajuda e sai\n"
-"  -n                        suprime caractere de nova linha\n"
-"  -v, --version             exibe a versão e sai\n"
-"  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
-"                            a MSGID no DOMÍNIO\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  exibe essa ajuda e sai\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               exibe a informação da versão e sai\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -275,12 +285,12 @@ msgstr ""
 "mensagens encontradas no catálogo selecionado\n"
 "Diretório de pesquisa padrão: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPÇÃO] [DOMÍNIO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -289,28 +299,31 @@ msgstr ""
 "Exibe tradução de idioma nativo de uma mensagem textual cuja forma\n"
 "gramatical depende de um número.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-"  -e                        habilita expansão de alguns caracteres de escape\n"
-"  -E                        (ignorado para compatibilidade)\n"
-"  -h, --help                exibe esta ajuda e sai\n"
-"  -n                        suprime caractere de nova linha\n"
-"  -v, --version             exibe a versão e sai\n"
-"  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
-"                            para MSGID no DOMÍNIO\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -328,17 +341,81 @@ msgstr ""
 "mensagens encontradas no catálogo selecionado\n"
 "Diretório de pesquisa padrão: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção \"--%s\" não permite um argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opção desconhecida \"--%s\"\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: a opção \"-W %s\" é ambígua\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" exige um argumento\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
+#~ "  -e                        habilita expansão de alguns caracteres de escape\n"
+#~ "  -E                        (ignorado para compatibilidade)\n"
+#~ "  -h, --help                exibe esta ajuda e sai\n"
+#~ "  -n                        suprime caractere de nova linha\n"
+#~ "  -v, --version             exibe a versão e sai\n"
+#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
+#~ "                            a MSGID no DOMÍNIO\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMÍNIO      obtém mensagens traduzidas em DOMÍNIO\n"
+#~ "  -e                        habilita expansão de alguns caracteres de escape\n"
+#~ "  -E                        (ignorado para compatibilidade)\n"
+#~ "  -h, --help                exibe esta ajuda e sai\n"
+#~ "  -v, --version             exibe a versão e sai\n"
+#~ "  [DOMÍNIO]                 obtém mensagens traduzidas de DOMÍNIO\n"
+#~ "  MSGID MSGID-PLURAL        traduz MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  NÚMERO                    escolhe forma singular/plural com base no valor\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não existe\n"
-#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n"
+#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não "
+#~ "existe\n"
+#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA "
+#~ "FINALIDADE.\n"
 
 #~ msgid "error while opening \"%s\" for reading"
 #~ msgstr "erro ao abrir \"%s\" para leitura"
@@ -365,14 +442,18 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "number of format specifications in 'msgid' and '%s' does not match"
-#~ msgstr "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ msgstr ""
+#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
-#~ msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
@@ -380,7 +461,9 @@ msgstr ""
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
-#~ msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
@@ -388,27 +471,38 @@ msgstr ""
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
-#~ msgstr "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ msgstr ""
+#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
 #, fuzzy
 #~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
-#~ msgstr "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#~ "tuple"
+#~ msgstr ""
+#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
-#~ msgstr "número de especificações de formatos em `msgid' e `msgstr' não conferem"
+#~ msgid ""
+#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#~ "mapping"
+#~ msgstr ""
+#~ "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
 #, fuzzy
-#~ msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
@@ -416,7 +510,9 @@ msgstr ""
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #, fuzzy
-#~ msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
 #~ msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #~ msgid "%s and %s are mutually exclusive"
@@ -430,10 +526,13 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                write the .po file using indented style\n"
 #~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
@@ -441,15 +540,18 @@ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -464,15 +566,18 @@ msgstr ""
 #~ "before messages are printed.  Conversely, the --less-than option may be\n"
 #~ "used to specify less commonality before messages are printed (i.e.\n"
 #~ "--less-than=2 will only print the unique messages).  Translations,\n"
-#~ "comments and extract comments will be cumulated, except that if --use-first\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
 #~ "is specified, they will be taken from the first PO file to define them.\n"
 #~ "File positions from all PO files will be cumulated.\n"
 #~ msgstr ""
 #~ "  -V, --version                  mostra informações de versão e sai\n"
 #~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este número\n"
+#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este número\n"
+#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
 #~ "\n"
 #~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
@@ -489,7 +594,8 @@ msgstr ""
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 0 if not set\n"
@@ -498,9 +604,11 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  mostra informações de versão e sai\n"
 #~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este número\n"
+#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este número\n"
+#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
 #~ "\n"
 #~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
@@ -517,33 +625,44 @@ msgstr ""
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for each\n"
-#~ "                                 message, don't merge several translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -557,25 +676,32 @@ msgstr ""
 #~ msgid ""
 #~ "Compare two Uniforum style .po files to check that both contain the same\n"
 #~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
-#~ "translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
 #~ "file (generally created by xgettext).  This is useful for checking that\n"
-#~ "you have translated each and every message in your program.  Where an exact\n"
-#~ "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ "you have translated each and every message in your program.  Where an "
+#~ "exact\n"
+#~ "match cannot be found, fuzzy matching is used to produce better "
+#~ "diagnostics.\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIRETÓRIO  adiciona DIRETÓRIO na lista de pesquisa dos \n"
+#~ "  -D, --directory=DIRETÓRIO  adiciona DIRETÓRIO na lista de pesquisa "
+#~ "dos \n"
 #~ "                             arquivos de entrada\n"
 #~ "  -h, --help                 apresenta esta ajuda e finaliza\n"
 #~ "  -V, --version              apresenta informações da versão e finaliza\n"
 #~ "\n"
-#~ "Compara dois arquivos .po de estilo Uniforum para checar se ambos contém o\n"
+#~ "Compara dois arquivos .po de estilo Uniforum para checar se ambos contém "
+#~ "o\n"
 #~ "mesmo conjunto de strings msgid. O arquivo def.po deve ser um arquivo PO\n"
-#~ "existente com as traduções antigas. O arquivo ref.po é o último arquivo PO\n"
+#~ "existente com as traduções antigas. O arquivo ref.po é o último arquivo "
+#~ "PO\n"
 #~ "criado (geralmente pelo xgettext). Isto é útil para comparar se todas as\n"
 #~ "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"
+#~ "encontrada uma aproximação é utilizada para produzir um melhor "
+#~ "diagnóstico.\n"
 
 #~ msgid "this message is used but not defined..."
 #~ msgstr "esta mensagem é utilizada, mas não foi definida..."
@@ -610,9 +736,11 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  mostra informações de versão e sai\n"
 #~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este número\n"
+#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este número\n"
+#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
 #~ "\n"
 #~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
@@ -629,7 +757,8 @@ msgstr ""
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -638,9 +767,11 @@ msgstr ""
 #~ msgstr ""
 #~ "  -V, --version                  mostra informações de versão e sai\n"
 #~ "  -w, --width=NUMBER             configura a largura de página de saída\n"
-#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este número\n"
+#~ "  -<, --less-than=NÚMERO         mostra mensagens menores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
-#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este número\n"
+#~ "  ->, --more-than=NÚMERO         mostra mensagens maiores que este "
+#~ "número\n"
 #~ "                                 o padrão é infinito\n"
 #~ "\n"
 #~ "Descobre mensagens que são comuns a dois ou mais do arquivos PO\n"
@@ -656,32 +787,42 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -693,10 +834,12 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
@@ -704,15 +847,18 @@ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -742,12 +888,15 @@ msgstr ""
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
@@ -755,15 +904,18 @@ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -826,7 +978,8 @@ msgstr ""
 
 #, 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"
+#~ msgstr ""
+#~ "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
 
 #, fuzzy
 #~ msgid "field `%s' still has initial default value\n"
@@ -854,7 +1007,9 @@ msgstr ""
 #~ msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 
 #~ 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"
+#~ msgstr ""
+#~ "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
+#~ "prefixo"
 
 #~ msgid "`domain %s' directive ignored"
 #~ msgstr "`domain %s': diretiva ignorada"
@@ -882,10 +1037,12 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
@@ -893,15 +1050,18 @@ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -918,7 +1078,8 @@ msgstr ""
 #~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
 #~ "existing PO file with translations which will be taken over to the newly\n"
 #~ "created file as long as they still match; comments will be preserved,\n"
-#~ "but extracted comments and file positions will be discarded.  The ref.pot\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
 #~ "file is the last created PO file with up-to-date source references but\n"
 #~ "old translations, or a PO Template file (generally created by xgettext);\n"
 #~ "any translations or comments in the file will be discarded, however dot\n"
@@ -927,11 +1088,14 @@ msgstr ""
 #~ msgstr ""
 #~ "\n"
 #~ "Unifica dois arquivos .po de estilo Uniforum. O arquivo def.po é um\n"
-#~ "arquivo PO existente com as traduções antigas que serão utilizadas no novo\n"
+#~ "arquivo PO existente com as traduções antigas que serão utilizadas no "
+#~ "novo\n"
 #~ "arquivo, enquanto elas coincidirem; comentários são preservados, porém\n"
 #~ "comentários extraídos e posições de arquivos serão descartados.\n"
-#~ "O arquivo ref.po é o último arquivo PO criado (geralmente pelo xgettext),\n"
-#~ "em que qualquer tradução ou comentário são descartados, exceto comentários\n"
+#~ "O arquivo ref.po é o último arquivo PO criado (geralmente pelo "
+#~ "xgettext),\n"
+#~ "em que qualquer tradução ou comentário são descartados, exceto "
+#~ "comentários\n"
 #~ "\"ponto\" e posições de arquivo. Onde as igualdades não forem exatas,\n"
 #~ "aproximações podem ser utilizadas para produzirem melhores resultados.\n"
 #~ "Os resultados serão gravados na saída padrão, a menos que um arquivo de\n"
@@ -945,8 +1109,12 @@ msgstr ""
 #~ msgid "this message should not define plural forms"
 #~ msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#~ msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-#~ msgstr "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, perdidas %ld, obsoletas %ld.\n"
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, "
+#~ "perdidas %ld, obsoletas %ld.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " feito.\n"
@@ -972,7 +1140,8 @@ msgstr ""
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios para\n"
 #~ "as opções curtas\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
@@ -1066,9 +1235,8 @@ msgstr ""
 #~ msgid "error writing stdout"
 #~ msgstr "erro ao gravar o arquivo \"%s\""
 
-#, fuzzy
 #~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "não foi possível criar o arquivo de saída \"%s\""
+#~ msgstr "não foi possível criar um arquivo de saída \"%s\""
 
 #~ msgid "error while writing \"%s\" file"
 #~ msgstr "erro ao gravar o arquivo \"%s\""
@@ -1076,8 +1244,11 @@ msgstr ""
 #~ msgid "error while opening \"%s\" for writing"
 #~ msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "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\""
@@ -1095,7 +1266,9 @@ msgstr ""
 #~ msgstr "este arquivo parece não conter diretivas de domínio"
 
 #~ 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"
+#~ msgstr ""
+#~ "--join-existing não pode ser usado enquanto a saída é escrita na saída "
+#~ "padrão"
 
 #~ msgid "xgettext cannot work without keywords to look for"
 #~ msgstr "xgettext não pode funcionar sem as teclas para procurar"
@@ -1106,36 +1279,49 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -1177,10 +1363,14 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
@@ -1192,36 +1382,48 @@ msgstr ""
 #~ "  -d, --default-domain=NOME      utiliza NOME.po para a saída, ao invés\n"
 #~ "                                 de messages.po\n"
 #~ "  -D, --directory=DIRETÓRIO      muda para DIRETÓRIO antes de começar\n"
-#~ "  -e, --no-escape                não utiliza escapes C na saída (default)\n"
+#~ "  -e, --no-escape                não utiliza escapes C na saída "
+#~ "(default)\n"
 #~ "  -E, --escape                   usa escapes C na saída, sem caracteres\n"
 #~ "                                 estendidos\n"
-#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de entrada\n"
-#~ "  -F, --sort-by-file             ordena a saída pela localização dos arquivos\n"
+#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de "
+#~ "entrada\n"
+#~ "  -F, --sort-by-file             ordena a saída pela localização dos "
+#~ "arquivos\n"
 #~ "  -h, --help                     apresenta esta ajuda e finaliza\n"
 
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -i, --indent                   grava o arquivo .po usando o estilo indentado\n"
+#~ "  -i, --indent                   grava o arquivo .po usando o estilo "
+#~ "indentado\n"
 #~ "      --no-location              não grava linhas '#: arquivo:linha'\n"
-#~ "  -n, --add-location             adiciona linhas '#: arquivo:linha'(padrão)\n"
+#~ "  -n, --add-location             adiciona linhas '#: arquivo:"
+#~ "linha'(padrão)\n"
 #~ "      --omit-header              não grava cabeçalho com `msgid \"\"' \n"
 #~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
 #~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo duplicidades\n"
+#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
 #~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
-#~ "  -u, --unique                   atalho para --less-than=2, somente mensagens\n"
+#~ "  -u, --unique                   atalho para --less-than=2, somente "
+#~ "mensagens\n"
 #~ "                                 únicas serão mostradas\n"
 
 #~ msgid ""
@@ -1229,12 +1431,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -1247,25 +1453,32 @@ msgstr ""
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO]  arquivo.po ...\n"
-#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de texto.\n"
+#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de "
+#~ "texto.\n"
 #~ "\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"
-#~ "  -c, --check              executa conferências dependentes de linguagem em strings\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\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 "
+#~ "arquivos de entrada\n"
 #~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na saída\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "      --no-hash            arquivos binários não serão incluídos na tabela hash\n"
+#~ "      --no-hash            arquivos binários não serão incluídos na "
+#~ "tabela hash\n"
 #~ "  -o, --output-file=ARQ    especifica o nome do arquivo de saída ARQ\n"
 #~ "      --statistics         mostra estatísticas das traduções\n"
 #~ "      --strict             habilita o modo Uniforum estrito\n"
 #~ "  -v, --verbose            lista problemas do arquivo de entrada\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 #~ "\n"
-#~ "Informando a opção -v mais que uma vez as mensagens de saída são incrementadas\n"
+#~ "Informando a opção -v mais que uma vez as mensagens de saída são "
+#~ "incrementadas\n"
 #~ "\n"
-#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de saída\n"
+#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de "
+#~ "saída\n"
 #~ "seja - as mensagens serão geradas na saída padrão\n"
 
 #~ msgid ""
@@ -1290,14 +1503,20 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] ARQUIVO DE ENTRADA ...\n"
@@ -1307,40 +1526,56 @@ msgstr ""
 #~ "para as opções curtas\n"
 #~ "  -a, --extract-all              extrai todas as strings\n"
 #~ "  -c, --add-comments[=TAG]       adiciona blocos de comentários com TAG\n"
-#~ "                                 precedendo as linhas do arquivo de saída\n"
+#~ "                                 precedendo as linhas do arquivo de "
+#~ "saída\n"
 #~ "  -C, --c++                      reconhece estilo C++ de comentários\n"
 #~ "      --debug                    formato de saída mais detalhado\n"
 #~ "  -d, --default-domain=NOME      utiliza NOME.po para a saída, ao invés\n"
 #~ "                                 de messages.po\n"
 #~ "  -D, --directory=DIRETÓRIO      muda para DIRETÓRIO antes de começar\n"
-#~ "  -e, --no-escape                não utiliza escapes C na saída (default)\n"
+#~ "  -e, --no-escape                não utiliza escapes C na saída "
+#~ "(default)\n"
 #~ "  -E, --escape                   usa escapes C na saída, sem caracteres\n"
 #~ "                                 estendidos\n"
-#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de entrada\n"
+#~ "  -f, --files-from=ARQ           lê ARQ como uma lista dos arquivos de "
+#~ "entrada\n"
 #~ "      --force-po                 escreve o arquivo .po mesmo que vazio\n"
-#~ "      --foreign-user             omite o  copyright da FSF na saída para estrangeiros\n"
-#~ "  -F, --sort-by-file             ordena a saída pela localização dos arquivos\n"
+#~ "      --foreign-user             omite o  copyright da FSF na saída para "
+#~ "estrangeiros\n"
+#~ "  -F, --sort-by-file             ordena a saída pela localização dos "
+#~ "arquivos\n"
 
 #~ msgid ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                     mostra a ajuda e sai\n"
-#~ "  -i, --indent                   grava o arquivo .po usando estilo indentado\n"
-#~ "  -j, --join-existing            adiciona mensagens a um arquivo já existente\n"
-#~ "  -k, --keyword[=PALAVRA]        palavra chave adicional a ser pesquisada\n"
-#~ "                                 (sem PALAVRA significa não usar as palavras\n"
+#~ "  -i, --indent                   grava o arquivo .po usando estilo "
+#~ "indentado\n"
+#~ "  -j, --join-existing            adiciona mensagens a um arquivo já "
+#~ "existente\n"
+#~ "  -k, --keyword[=PALAVRA]        palavra chave adicional a ser "
+#~ "pesquisada\n"
+#~ "                                 (sem PALAVRA significa não usar as "
+#~ "palavras\n"
 #~ "                                 chaves padrões)\n"
-#~ "  -L, --language=NOME            reconhece a linguagem especificada (C, C++, PO), caso \n"
-#~ "                                 contrário é escolhida através da extensão do arquivo\n"
+#~ "  -L, --language=NOME            reconhece a linguagem especificada (C, C+"
+#~ "+, PO), caso \n"
+#~ "                                 contrário é escolhida através da "
+#~ "extensão do arquivo\n"
 #~ "  -m, --msgstr-prefix[=STRING]   usa STRING ou \"\" como prefixo para as\n"
 #~ "                                 entradas msgstr\n"
 #~ "  -M, --msgstr-suffix[=STRING]   usa STRING ou \"\" como sufixo para as\n"
@@ -1348,12 +1583,17 @@ msgstr ""
 #~ "      --no-location              não gravar linhas '#: arquivo:linha'\n"
 
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -1361,24 +1601,29 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             adicionar linhas '#: arquivo:linha' (default)\n"
+#~ "  -n, --add-location             adicionar linhas '#: arquivo:"
+#~ "linha' (default)\n"
 #~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
 #~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
 #~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo duplicidades\n"
+#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
 #~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
 #~ "  -V, --version                  apresenta informação de versão e sai\n"
-#~ "  -n, --add-location             adicionar linhas '#: arquivo:linha' (default)\n"
+#~ "  -n, --add-location             adicionar linhas '#: arquivo:"
+#~ "linha' (default)\n"
 #~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
 #~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
 #~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo duplicidades\n"
+#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
 #~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
 #~ "  -V, --version                  apresenta informação de versão e sai\n"
 #~ "  -w, width=NÚMERO               configura a largura da página de saída\n"
-#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são extraídas\n"
+#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são "
+#~ "extraídas\n"
 #~ "\n"
 #~ "Se ARQUIVO DE ENTRADA é -, a entrada padrão é lida.\n"
 
diff --git a/gettext-runtime/po/ro.po b/gettext-runtime/po/ro.po
index d0c4a4a1c..6ee33bfde 100644
--- a/gettext-runtime/po/ro.po
+++ b/gettext-runtime/po/ro.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
-"POT-Creation-Date: 2003-10-16 21:36+0200\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -14,144 +15,134 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: ../gettext-tools/lib/closeout.c:66
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: ../gettext-tools/lib/error.c:137 ../gettext-tools/lib/error.c:165
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
-#: ../gettext-tools/lib/getopt.c:689 ../gettext-tools/lib/getopt.c:701
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: ../gettext-tools/lib/getopt.c:734 ../gettext-tools/lib/getopt.c:738
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: ../gettext-tools/lib/getopt.c:747 ../gettext-tools/lib/getopt.c:752
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: op�iune necunoscut� `%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
 
-#: ../gettext-tools/lib/getopt.c:788 ../gettext-tools/lib/getopt.c:801
-#: ../gettext-tools/lib/getopt.c:1090 ../gettext-tools/lib/getopt.c:1103
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: ../gettext-tools/lib/getopt.c:839 ../gettext-tools/lib/getopt.c:842
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op�iune necunoscut� `--%s'\n"
-
-#: ../gettext-tools/lib/getopt.c:850 ../gettext-tools/lib/getopt.c:853
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op�iune necunoscut� `%c%s'\n"
-
-#: ../gettext-tools/lib/getopt.c:900 ../gettext-tools/lib/getopt.c:903
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
-
-#: ../gettext-tools/lib/getopt.c:909 ../gettext-tools/lib/getopt.c:912
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: op�iune invalid� -- %c\n"
 
-#: ../gettext-tools/lib/getopt.c:959 ../gettext-tools/lib/getopt.c:970
-#: ../gettext-tools/lib/getopt.c:1156 ../gettext-tools/lib/getopt.c:1169
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: op�iunea necesit� un parametru -- %c\n"
 
-#: ../gettext-tools/lib/getopt.c:1022 ../gettext-tools/lib/getopt.c:1033
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
-
-#: ../gettext-tools/lib/getopt.c:1057 ../gettext-tools/lib/getopt.c:1069
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
-
-#: ../gettext-tools/lib/xmalloc.c:41
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plin�"
 
-#: src/envsubst.c:113 src/gettext.c:135 src/ngettext.c:125
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Acesta este software liber; citi�i sursele pentru condi�ii de copiere.  NU exist� nici o garan�ie; nici m�car pentru VANDABILITATE sau MODIFICARE �NTR-UN SCOP PRIVAT.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#. This is a proper name. See the gettext manual, section Names.
+#: src/envsubst.c:118
+msgid "Bruno Haible"
+msgstr ""
+
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "parametri lips�"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Folosire: %s [OP�IUNE] [FORMAT-SHELL]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "�nlocuie�te valorile variabilelor de mediu.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             afi�eaz� variabilele din FORMAT-SHELL\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativ:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, 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"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -169,7 +160,7 @@ msgstr ""
 "toate referin�ele variabilelor de mediu din intrarea(input) standard sunt\n"
 "substituite.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -179,20 +170,29 @@ msgstr ""
 "(output) va consta �n variabilele de mediula care se face referire �n\n"
 "FORMAT-SHELL, c�te una pe linie.\n"
 
-#: src/envsubst.c:215 src/gettext.c:276 src/ngettext.c:242
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:438
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare �n citirea \"%s\""
 
-#: src/envsubst.c:439
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/gettext.c:244
+#. This is a proper name. See the gettext manual, section Names.
+#: src/gettext.c:143 src/ngettext.c:132
+msgid "Ulrich Drepper"
+msgstr ""
+
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -201,40 +201,73 @@ msgstr ""
 "Folosire: %s [OP�IUNE] [[DOMENIU_TEXT] MSGID]\n"
 "sau:    %s [OP�IUNE] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Afi�eaz� traducerea din limb� nativ� a unui mesaj textual.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMENIU_TEXT   preia mesaje traduse din DOMENIU_TEXT\n"
-"  -e                        activeaz� expansiunea unor secven�e escape\n"
-"  -E                        (ignorat pentru compatibilitate)\n"
-"  -h, --help                afi�eaz� acest ajutor �i iese\n"
-"  -n                        elimin� marcajul newline de sf�r�it\n"
-"  -V, --version             afi�eaz� informa�ii despre versiune �i iese\n"
-"  [DOMENIU_TEXT] MSGID        preia mesajele traduse corespunz�toare\n"
-"                            lui MSGID din DOMENIU_TEXT\n"
-
-#: src/gettext.c:265
-#, c-format, no-wrap
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               afi�eaz� informa�ii despre versiune �i iese\n"
+
+#: src/gettext.c:285
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#| "regular directory, another location can be specified with the environment\n"
+#| "variable TEXTDOMAINDIR.\n"
+#| "When used with the -s option the program behaves like the `echo' command.\n"
+#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#| "found in the selected catalog are translated.\n"
+#| "Standard search directory: %s\n"
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -248,12 +281,12 @@ msgstr ""
 "sunt traduse acele mesaje care sunt g�site �n catalogul selectat.\n"
 "Directorul de c�utare standard: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Folosire: %s [OP�IUNE] [DOMENIU_TEXT] MSGID MSGID-PLURAL NUM�RARE\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -262,28 +295,31 @@ msgstr ""
 "Afi�eaz� traducerea din limba nativ� a mesajului textual a c�rui form�\n"
 "gramatical� depinde de un num�r.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMENIU_TEXT   preia mesaje traduse din DOMENIU_TEXT\n"
-"  -e                        activeaz� expansiunea unor secven�e escape\n"
-"  -E                        (ignorat pentru compatibilitate)\n"
-"  -h, --help                afi�eaz� acest ajutor �i iese\n"
-"  -V, --version             afi�eaz� informa�ii despre versiune �i iese\n"
-"  [DOMENIU_TEXT]        preia mesajele traduse din DOMENIU_TEXT\n"
-"  MSGID MSGID-PLURAL        traduce MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  NUM�RARE                     alege forma singular�/plural� bazat� pe aceast� valoare\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -297,3 +333,72 @@ msgstr ""
 "este g�sit �n directorul obi�nuit, o alt� loca�ie poate fi specificat� �n variabila de\n"
 "mediu TEXTDOMAINDIR.\n"
 "Directorul de c�utare standard: %s\n"
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `--%s' nu permite parametri\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: op�iune necunoscut� `--%s'\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: op�iune ilegal� -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Acesta este software liber; citi�i sursele pentru condi�ii de copiere.  NU exist� nici o garan�ie; nici m�car pentru VANDABILITATE sau MODIFICARE �NTR-UN SCOP PRIVAT.\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENIU_TEXT   preia mesaje traduse din DOMENIU_TEXT\n"
+#~ "  -e                        activeaz� expansiunea unor secven�e escape\n"
+#~ "  -E                        (ignorat pentru compatibilitate)\n"
+#~ "  -h, --help                afi�eaz� acest ajutor �i iese\n"
+#~ "  -n                        elimin� marcajul newline de sf�r�it\n"
+#~ "  -V, --version             afi�eaz� informa�ii despre versiune �i iese\n"
+#~ "  [DOMENIU_TEXT] MSGID        preia mesajele traduse corespunz�toare\n"
+#~ "                            lui MSGID din DOMENIU_TEXT\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENIU_TEXT   preia mesaje traduse din DOMENIU_TEXT\n"
+#~ "  -e                        activeaz� expansiunea unor secven�e escape\n"
+#~ "  -E                        (ignorat pentru compatibilitate)\n"
+#~ "  -h, --help                afi�eaz� acest ajutor �i iese\n"
+#~ "  -V, --version             afi�eaz� informa�ii despre versiune �i iese\n"
+#~ "  [DOMENIU_TEXT]        preia mesajele traduse din DOMENIU_TEXT\n"
+#~ "  MSGID MSGID-PLURAL        traduce MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  NUM�RARE                     alege forma singular�/plural� bazat� pe aceast� valoare\n"
diff --git a/gettext-runtime/po/ru.po b/gettext-runtime/po/ru.po
index 0712a5af3..6573677a1 100644
--- a/gettext-runtime/po/ru.po
+++ b/gettext-runtime/po/ru.po
@@ -3,101 +3,87 @@
 # Copyright (C) 1998 Free Software Foundation, Inc.
 #
 # Oleg S. Tihonov <oleg.tihonov@gmail.com>, 1998, 2001, 2002, 2003, 2005, 2006, 2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015.
+# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2015-06-26 08:56+0300\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-12-24 09:22+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"Language-Team: Russian <gnu@d07.ru>\n"
 "Language: ru\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"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
 "X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "ошибка записи"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Неизвестная системная ошибка"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмысленный параметр ?%s?; возможные варианты:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: двусмысленный параметр «%s»\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?--%s? не может быть аргумента\n"
-
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?%c%s? не может быть аргумента\n"
-
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: для параметра ?--%s? требуется аргумент\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неизвестный параметр ?--%s?\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неизвестный параметр ?%c%s?\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: нераспознанный параметр «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: для параметра «--%s» требуется аргумент\n"
+
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: недопустимый параметр ? ?%c?\n"
+msgstr "%s: недопустимый параметр — «%c»\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: для параметра требуется аргумент ? ?%c?\n"
-
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр ?-W %s?\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: у параметра ?-W %s? не может быть аргумента\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для параметра ?-W %s? требуется аргумент\n"
+msgstr "%s: для параметра требуется аргумент — «%c»\n"
 
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "память исчерпана"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,67 +92,67 @@ msgstr ""
 "Это свободное ПО: вы можете продавать и распространять его.\n"
 "Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
-msgstr "Автор программы ? %s.\n"
+msgstr "Автор программы — %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr "Бруно Хайбл"
+msgstr "Бруно Хайбл (Bruno Haible)"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "слишком много аргументов"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "необходимо задать аргументы"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "По команде ?%s --help? можно получить дополнительную информацию.\n"
+msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Использование: %s [ПАРАМЕТР] [ФОРМАТ-ОБОЛОЧКИ]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Подставляет значения переменных окружения.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Режим работы:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             вывести переменные, найденные в ФОРМАТЕ-ОБОЛОЧКИ\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Информационный вывод:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  напечатать эту справку и выйти\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               напечатать информацию о версии и выйти\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +169,7 @@ msgstr ""
 "ФОРМАТЕ-ОБОЛОЧКИ; в противном случае подставляются все ссылки на\n"
 "переменные окружения, встречающиеся на стандартном вводе.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -197,60 +183,83 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "ошибка при чтении ?%s?"
+msgstr "ошибка чтения «%s»"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "стандартный ввод"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
-msgstr "Ульрих Дреппер"
+msgstr "Ульрих Дреппер (Ulrich Drepper)"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
 "Использование: %s [ПАРАМЕТР] [[ДОМЕН] MSGID]\n"
-"      или:     %s [ПАРАМЕТР] -s [MSGID]?\n"
+"      или:     %s [ПАРАМЕТР] -s [MSGID]…\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Отображает перевод текстового сообщения.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=ДОМЕН        использовать переведённые сообщения из ДОМЕНА\n"
-"  -e                        разрешить использование некоторых экранирующих\n"
-"                            последовательностей\n"
-"  -E                        (игнорируется для совместимости)\n"
-"  -h, --help                показать эту справку и выйти\n"
-"  -n                        не выводить завершающий перевод строки\n"
-"  -V, --version             показать информацию о версии и выйти\n"
-"  [ДОМЕН] MSGID             найти перевод сообщения MSGID в ДОМЕНЕ\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  напечатать эту справку и выйти\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               напечатать информацию о версии и выйти\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -267,16 +276,16 @@ msgstr ""
 "найден в стандартном каталоге, можно указать другой каталог с помощью\n"
 "переменной окружения TEXTDOMAINDIR.\n"
 "При использовании с параметром -s, поведение программы похоже на поведение\n"
-"команды ?echo?. Но вместо простого копирования аргументов в\n"
+"команды «echo». Но вместо простого копирования аргументов в\n"
 "стандартный вывод, выводятся их переводы из указанного домена.\n"
 "Стандартный каталог поиска: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Использование: %s [ПАРАМЕТР] [ДОМЕН] MSGID MSGID-PLURAL ЧИСЛО\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,29 +294,31 @@ msgstr ""
 "Отображает перевод текстового сообщения, грамматическая форма которого\n"
 "зависит от некоторого числа.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=ДОМЕН     использовать переведенные сообщения из ДОМЕНА\n"
-"  -e                     разрешить использование некоторых экранирующих\n"
-"                         последовательностей\n"
-"  -E                     (игнорируется для совместимости)\n"
-"  -h, --help             показать эту справку и выйти\n"
-"  -V, --version          показать информацию о версии и выйти\n"
-"  [ДОМЕН]                найти перевод сообщения в указанном ДОМЕНЕ\n"
-"  MSGID MSGID-PLURAL     перевести MSGID (ед. число) / MSGID-PLURAL (мн. число)\n"
-"  ЧИСЛО                  выбрать ед./мн. число на основе этого значения\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -322,15 +333,80 @@ msgstr ""
 "переменной окружения TEXTDOMAINDIR.\n"
 "Стандартный каталог поиска: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: у параметра «--%s» не может быть аргумента\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: нераспознанный параметр «--%s»\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: параметр «-W %s» неоднозначен\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: для параметра «-W %s» требуется аргумент\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕН        использовать переведённые сообщения из ДОМЕНА\n"
+#~ "  -e                        разрешить использование некоторых экранирующих\n"
+#~ "                            последовательностей\n"
+#~ "  -E                        (игнорируется для совместимости)\n"
+#~ "  -h, --help                показать эту справку и выйти\n"
+#~ "  -n                        не выводить завершающий перевод строки\n"
+#~ "  -V, --version             показать информацию о версии и выйти\n"
+#~ "  [ДОМЕН] MSGID             найти перевод сообщения MSGID в ДОМЕНЕ\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕН     использовать переведенные сообщения из ДОМЕНА\n"
+#~ "  -e                     разрешить использование некоторых экранирующих\n"
+#~ "                         последовательностей\n"
+#~ "  -E                     (игнорируется для совместимости)\n"
+#~ "  -h, --help             показать эту справку и выйти\n"
+#~ "  -V, --version          показать информацию о версии и выйти\n"
+#~ "  [ДОМЕН]                найти перевод сообщения в указанном ДОМЕНЕ\n"
+#~ "  MSGID MSGID-PLURAL     перевести MSGID (единственное число) или\n"
+#~ "                         MSGID-PLURAL (множественное число)\n"
+#~ "  ЧИСЛО                  выбрать ед./мн. число на основе этого значения\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Это свободная программа; подробности об условиях распространения смотрите\n"
+#~ "Это свободная программа; подробности об условиях распространения "
+#~ "смотрите\n"
 #~ "в исходном тексте.  Мы НЕ предоставляем гарантий; даже гарантий\n"
 #~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
diff --git a/gettext-runtime/po/sk.po b/gettext-runtime/po/sk.po
index 19c345ccc..2e399c213 100644
--- a/gettext-runtime/po/sk.po
+++ b/gettext-runtime/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-23 20:24+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -16,87 +16,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: voľba '%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neznáma voľba '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: voľba '%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: voľba '--%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neznáma voľba '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neznáma voľba '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, 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:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "pamäť je vyčerpaná"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -105,7 +90,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
@@ -115,57 +100,57 @@ msgstr "Napísal %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "chýbajúce parametre"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Použitie: %s [VOĽBA] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Nahradí hodnoty premenných prostredia.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Režim operácie:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             vypísať premenné nachádzajúce sa v SHELL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobraziť túto pomoc a skončiť\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               vypísať informácie o verzii a skončiť\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -181,7 +166,7 @@ msgstr ""
 "len tie premenné prostredia, ktoré sú uvedené v SHELL-FORMAT. V opačnom prípade\n"
 "sú nahradené všetky odkazy na premenné prostredia v štandardnom vstupe.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -195,27 +180,29 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 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 anglicky).\n"
-"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux.sk>.\n"
+"Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
+"anglicky).\n"
+"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux."
+"sk>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri čítaní \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "štandardný vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -224,34 +211,56 @@ msgstr ""
 "Použitie: %s [VOĽBA] [[DOMÉNA] ID_SPRÁVY]\n"
 "alebo:    %s [VOĽBA] -s [ID_SPRÁVY]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Zobraziť preklad textovej správy do natívneho jazyka.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMÉNA       vybrať preložené správy z DOMÉNY\n"
-"  -e                        povoliť rozvinutie niektorých riadiacich\n"
-"                            sekvencií znakov\n"
-"  -E                        (bez významu; kvôli spätnej kompatibilite)\n"
-"  -h, --help                zobraziť túto nápovedu a skončiť\n"
-"  -n                        potlačiť prázdny riadok na konci\n"
-"  -V, --version             zobraziť informáciu o verzii a skončiť\n"
-"  [DOMÉNA] ID_SPRÁVY        vybrať preloženú správu zodpovedajúcu ID_SPRÁVY\n"
-"                            z DOMÉNY\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  zobraziť túto pomoc a skončiť\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               vypísať informácie o verzii a skončiť\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -271,12 +280,12 @@ msgstr ""
 "ktoré sa nachádzajú vo vybranom katalógu správ budú preložené.\n"
 "Štandardný adresár, v ktorom sa budú hľadať katalógy: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Použitie: %s [VOĽBA] [DOMÉNA] ID_SPRÁVY ID_SPRÁVY-MNČ POČET\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,30 +294,31 @@ msgstr ""
 "Zobraziť preklad textovej správy, ktorej gramatický tvar závisí od čísla,\n"
 "do natívneho jazyka.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMÉNA       vybrať preložené správy z DOMÉNY\n"
-"  -e                        povoliť rozvinutie niektorých riadiacich\n"
-"                            sekvencií znakov\n"
-"  -E                        (bez významu; kvôli spätnej kompatibilite)\n"
-"  -h, --help                zobraziť túto nápovedu a skončiť\n"
-"  -V, --version             zobraziť informácie o verzii a skončiť\n"
-"  [DOMÉNA]                  vybrať preloženú správu z DOMÉNY\n"
-"  ID_SPRÁVY ID_SPRÁVY-MNČ   preložiť ID_SPRÁVY (jednotné číslo) / ID_SPRÁVY-MNČ\n"
-"                            (množné číslo)\n"
-"  POČET                     vybrať jednotné/množné číslo na základe tejto hodnoty\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -321,3 +331,66 @@ 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"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: voľba '--%s' nepovoľuje parameter\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: neznáma voľba '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: voľba '-W %s' nie je jednoznačná\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMÉNA       vybrať preložené správy z DOMÉNY\n"
+#~ "  -e                        povoliť rozvinutie niektorých riadiacich\n"
+#~ "                            sekvencií znakov\n"
+#~ "  -E                        (bez významu; kvôli spätnej kompatibilite)\n"
+#~ "  -h, --help                zobraziť túto nápovedu a skončiť\n"
+#~ "  -n                        potlačiť prázdny riadok na konci\n"
+#~ "  -V, --version             zobraziť informáciu o verzii a skončiť\n"
+#~ "  [DOMÉNA] ID_SPRÁVY        vybrať preloženú správu zodpovedajúcu ID_SPRÁVY\n"
+#~ "                            z DOMÉNY\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMÉNA       vybrať preložené správy z DOMÉNY\n"
+#~ "  -e                        povoliť rozvinutie niektorých riadiacich\n"
+#~ "                            sekvencií znakov\n"
+#~ "  -E                        (bez významu; kvôli spätnej kompatibilite)\n"
+#~ "  -h, --help                zobraziť túto nápovedu a skončiť\n"
+#~ "  -V, --version             zobraziť informácie o verzii a skončiť\n"
+#~ "  [DOMÉNA]                  vybrať preloženú správu z DOMÉNY\n"
+#~ "  ID_SPRÁVY ID_SPRÁVY-MNČ   preložiť ID_SPRÁVY (jednotné číslo) / ID_SPRÁVY-MNČ\n"
+#~ "                            (množné číslo)\n"
+#~ "  POČET                     vybrať jednotné/množné číslo na základe tejto hodnoty\n"
diff --git a/gettext-runtime/po/sl.po b/gettext-runtime/po/sl.po
index f7ce7d077..fccaeb473 100644
--- a/gettext-runtime/po/sl.po
+++ b/gettext-runtime/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-28 10:38+0200\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -17,87 +17,73 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: izbira '%s ni enopomenska; možnosti so:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: izbira '%s' ni enopomenska\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: izbira '--%s' ne dovoljuje argumenta\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: izbira '%s ni enopomenska; možnosti so:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neprepoznana izbira '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: izbira '%c%s' ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: izbira '--%s' zahteva argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznana izbira '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznana izbira '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neveljavna izbira -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: izbira zahteva argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: izbira '-W %s' ni enopomenska\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: izbira '-W %s' zahteva argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,7 +92,7 @@ msgstr ""
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
@@ -116,57 +102,57 @@ msgstr "Avtor %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argumenti manjkajo"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Uporaba: %s [IZBIRA] [UKAZNA-LUPINA]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Zamenja vrednosti spremenljivk okolja.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Način delovanja:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             izpiši spremenljivke v OBLIKI-SPREMENLJIVKE-OKOLJA\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ta navodila\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               različica programa\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -182,7 +168,7 @@ msgstr ""
 "se z vrednostmi nadomestijo le spremenljivke, navedene v njej, sicer pa se\n"
 "s svojimi vrednostmi nadomestijo vse spremenljivke na standardnem vhodu.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -195,25 +181,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standardni vhod"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -222,32 +208,56 @@ msgstr ""
 "Uporaba: %s [IZBIRA] [[DOMENA] MSGID]\n"
 "ali:     %s [IZBIRA] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Prikaz prevoda tekstovnega sporočila.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=DOMENA       prevode iščemo v podani besedilni DOMENI\n"
-"  -e                        omogočimo razširitev ubežnih zaporedij\n"
-"  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
-"  -h, --help                ta navodila\n"
-"  -n                        brez zaključnega skoka v novo vrstico\n"
-"  -V, --version             različica programa\n"
-"  [DOMENA] MSGID            iščemo prevod gesla MSGID v podani tekstovni DOMENI\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  ta navodila\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               različica programa\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -267,12 +277,12 @@ msgstr ""
 "kataloga sporočil.\n"
 "Privzet imenik s katalogom sporočil: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uporaba: %s [IZBIRA] [DOMENA] MSGID MSGID-PLURAL ŠTEVEC\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -281,28 +291,31 @@ msgstr ""
 "Prikaz prevoda besedilnega sporočila, katerega slovnična oblika je odvisna\n"
 "od števila.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=DOMENA       prevode iščemo v podani DOMENI\n"
-"  -e                        omogočimo razširitev ubežnih zaporedij\n"
-"  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
-"  -h, --help                ta navodila\n"
-"  -V, --version             različica programa\n"
-"  [DOMENA]                  prevode iščemo v podani DOMENI\n"
-"  MSGID MSGID-PLURAL        prevod MSGID (ednina) ali MSGID_PLURAL (množina)\n"
-"  ŠTEVEC                    določitev edninske/množinske oblike\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -316,13 +329,74 @@ msgstr ""
 "določimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n"
 "Privzet imenik s katalogom sporočil: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: izbira '--%s' ne dovoljuje argumenta\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: neprepoznana izbira '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: izbira '-W %s' ni enopomenska\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: izbira '-W %s' ne dovoljuje argumenta\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: izbira '-W %s' zahteva argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENA       prevode iščemo v podani besedilni DOMENI\n"
+#~ "  -e                        omogočimo razširitev ubežnih zaporedij\n"
+#~ "  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
+#~ "  -h, --help                ta navodila\n"
+#~ "  -n                        brez zaključnega skoka v novo vrstico\n"
+#~ "  -V, --version             različica programa\n"
+#~ "  [DOMENA] MSGID            iščemo prevod gesla MSGID v podani tekstovni DOMENI\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=DOMENA       prevode iščemo v podani DOMENI\n"
+#~ "  -e                        omogočimo razširitev ubežnih zaporedij\n"
+#~ "  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
+#~ "  -h, --help                ta navodila\n"
+#~ "  -V, --version             različica programa\n"
+#~ "  [DOMENA]                  prevode iščemo v podani DOMENI\n"
+#~ "  MSGID MSGID-PLURAL        prevod MSGID (ednina) ali MSGID_PLURAL (množina)\n"
+#~ "  ŠTEVEC                    določitev edninske/množinske oblike\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "To je prost program; pogoji, pod katerimi ga lahko razmnožujete in\n"
@@ -360,7 +434,8 @@ msgstr ""
 #~ msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
 
 #~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
+#~ msgstr ""
+#~ "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
 
 #~ msgid "cannot create pipe"
 #~ msgstr "cevovoda ni mogoče ustvariti"
@@ -374,22 +449,29 @@ msgstr ""
 #~ msgid "number of format specifications in 'msgid' and '%s' does not match"
 #~ msgstr "števili formatnih določil v ,msgid` in ,%s` se ne ujemata"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
 #~ msgstr "formatni določili v ,msgid` in ,%s` za argument %u nista enaki"
 
-#~ msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "v ,msgid` ni formatnega določila za argument %u, kot v ,%s`"
 
 #~ msgid "a format specification for argument %u doesn't exist in '%s'"
 #~ msgstr "v ,%2$s` ni formatnega določila za argument %1$u"
 
-#~ msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "v ,msgid` ni formatnega določila za argument {%u}, kot v ,%s`"
 
 #~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
 #~ msgstr "v ,%2$s` ni formatnega določila za argument {%1$u}"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
 #~ msgstr "formatni določili v ,msgid` in ,%s` za argument {%u} nista enaki"
 
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
@@ -398,19 +480,31 @@ msgstr ""
 #~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 #~ msgstr "formatna določila v ,%s` niso podmnožica tistih v ,msgid`"
 
-#~ msgid "format specifications in 'msgid' 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"
+#~ msgid ""
+#~ "format specifications in 'msgid' 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"
 
-#~ msgid "format specifications in 'msgid' 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"
+#~ msgid ""
+#~ "format specifications in 'msgid' 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"
 
-#~ msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "v ,msgid` ni formatnega določila za argument ,%s`, kot v ,%s`"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 #~ msgstr "v ,%2$s` ni formatnega določila za argument ,%1$s`"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#~ "same"
 #~ msgstr "formatni določili v ,msgid` in ,%s` za argument ,%s` nista enaki"
 
 #~ msgid "Usage: %s [OPTION]\n"
@@ -422,13 +516,15 @@ msgstr ""
 #~ msgid ""
 #~ "Output format:\n"
 #~ "  -s, --short           short host name\n"
-#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain name,\n"
+#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain "
+#~ "name,\n"
 #~ "                          and aliases\n"
 #~ "  -i, --ip-address      addresses for the hostname\n"
 #~ msgstr ""
 #~ "Oblika izpisa:\n"
 #~ "  -s, --short           kratka oblika gostiteljskega imena\n"
-#~ "  -f, --fqdn, --long    dolga oblika gostiteljskega imena, vključno s polnim\n"
+#~ "  -f, --fqdn, --long    dolga oblika gostiteljskega imena, vključno s "
+#~ "polnim\n"
 #~ "                          internetim imenom in vzdevki\n"
 #~ "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
@@ -445,13 +541,15 @@ msgstr ""
 #~ msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
 
 #~ msgid ""
-#~ "Filters the messages of a translation catalog according to their attributes,\n"
+#~ "Filters the messages of a translation catalog according to their "
+#~ "attributes,\n"
 #~ "and manipulates the attributes.\n"
 #~ msgstr ""
 #~ "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 #~ "in rokovanje z njimi.\n"
 
-#~ msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ msgid ""
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
 #~ msgstr ""
 #~ "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 #~ "tudi za kratko obliko.\n"
@@ -459,39 +557,49 @@ msgstr ""
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE      write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+#~ "standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
-#~ "      --translated            keep translated, remove untranslated messages\n"
-#~ "      --untranslated          keep untranslated, remove translated messages\n"
+#~ "      --translated            keep translated, remove untranslated "
+#~ "messages\n"
+#~ "      --untranslated          keep untranslated, remove translated "
+#~ "messages\n"
 #~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 #~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 #~ "      --no-obsolete           remove obsolete #~ messages\n"
 #~ "      --only-obsolete         keep obsolete #~ messages\n"
 #~ msgstr ""
 #~ "Izbira sporočil:\n"
-#~ "      --translated            obdržimo prevedena sporočila, zavržemo neprevedena\n"
-#~ "      --untranslated          obdržimo neprevedena sporočila, zavržemo prevedena\n"
-#~ "      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
-#~ "      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
+#~ "      --translated            obdržimo prevedena sporočila, zavržemo "
+#~ "neprevedena\n"
+#~ "      --untranslated          obdržimo neprevedena sporočila, zavržemo "
+#~ "prevedena\n"
+#~ "      --no-fuzzy              brez ohlapnih samodejno prevedenih "
+#~ "sporočil\n"
+#~ "      --only-fuzzy            zgolj ohlapna samodejno prevedena "
+#~ "sporočila\n"
 #~ "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 #~ "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
@@ -502,13 +610,16 @@ msgstr ""
 #~ "      --set-obsolete          set all messages obsolete\n"
 #~ "      --clear-obsolete        set all messages non-obsolete\n"
 #~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-#~ "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-"
+#~ "obsolete\n"
 #~ msgstr ""
 #~ "Rokovanje z določili:\n"
-#~ "      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
+#~ "      --set-fuzzy             vsa sporočila označimo kot ohlapno "
+#~ "pprevedena\n"
 #~ "      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
 #~ "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
-#~ "      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
+#~ "      --clear-obsolete        izbrišemo vse oznake o zastarelosti "
+#~ "prevodov\n"
 #~ "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 #~ "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
@@ -519,23 +630,29 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                write the .po file using indented style\n"
 #~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -554,7 +671,8 @@ msgstr ""
 #~ "before messages are printed.  Conversely, the --less-than option may be\n"
 #~ "used to specify less commonality before messages are printed (i.e.\n"
 #~ "--less-than=2 will only print the unique messages).  Translations,\n"
-#~ "comments and extract comments will be cumulated, except that if --use-first\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
 #~ "is specified, they will be taken from the first PO file to define them.\n"
 #~ "File positions from all PO files will be cumulated.\n"
 #~ msgstr ""
@@ -562,67 +680,88 @@ msgstr ""
 #~ "Poiščemo sporočila, ki so skupna dvema ali več podanima datotekama PO. Z\n"
 #~ "izbiro --more-than pred izpisom zahtevamo več skupnih lastnosti. Obratno\n"
 #~ "z izbiro --less-than izberemo manj skupnih lastnosti (npr. --less-than=2\n"
-#~ "izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in komentarji\n"
-#~ "pri izvlačenju iz vseh datotek se ohranijo, razen če z izbiro --use-first ne\n"
-#~ "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n"
+#~ "izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in "
+#~ "komentarji\n"
+#~ "pri izvlačenju iz vseh datotek se ohranijo, razen če z izbiro --use-first "
+#~ "ne\n"
+#~ "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. "
+#~ "Mesta\n"
 #~ "v datotekah iz vseh datotek PO se ohranijo.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE ...                  input files\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
-#~ "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz DATOTEKE\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih "
+#~ "datotek)\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz "
+#~ "DATOTEKE\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE         write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+#~ "standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 0 if not set\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO definicij\n"
+#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je neskončno)\n"
-#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je 1)\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo "
+#~ "samo\n"
 #~ "                                 enolično definirana sporočila\n"
 
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for each\n"
-#~ "                                 message, don't merge several translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
@@ -630,14 +769,17 @@ msgstr ""
 #~ "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 #~ "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 #~ "                             naletimo; ne združujemo več prevodov\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -664,14 +806,18 @@ msgstr ""
 #~ msgid ""
 #~ "Compare two Uniforum style .po files to check that both contain the same\n"
 #~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
-#~ "translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
 #~ "file (generally created by xgettext).  This is useful for checking that\n"
-#~ "you have translated each and every message in your program.  Where an exact\n"
-#~ "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ "you have translated each and every message in your program.  Where an "
+#~ "exact\n"
+#~ "match cannot be found, fuzzy matching is used to produce better "
+#~ "diagnostics.\n"
 #~ msgstr ""
 #~ "Preverimo, če dve podani datoteki v obliki Uniforum vsebujeta isti nabor\n"
 #~ "nizov msgid. Datoteka def.po je obstoječa datoteka PO s starimi prevodi,\n"
-#~ "datoteka ref.po pa nazadnje ustvarjena datoteka PO (v splošnem z xgettext).\n"
+#~ "datoteka ref.po pa nazadnje ustvarjena datoteka PO (v splošnem z "
+#~ "xgettext).\n"
 #~ "To je uporabno, ko želimo preveriti, če so prevedena res vsa sporočila\n"
 #~ "v programu.  Kadar ne najdemo natančnega ujemanja msgid, zaradi boljše\n"
 #~ "diagnostike poskusimo z ohlapnim (fuzzy) algoritmom.\n"
@@ -680,16 +826,19 @@ msgstr ""
 #~ "Input file location:\n"
 #~ "  def.po                      translations\n"
 #~ "  ref.pot                     references to the sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ msgstr ""
 #~ "Izbira vhodnih datotek:\n"
 #~ "  def.po                      prevodi\n"
 #~ "  ref.pot                     sklici na vire\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 
 #~ msgid ""
 #~ "Operation modifiers:\n"
-#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
 #~ msgstr ""
 #~ "Modifikatorji delovanja:\n"
 #~ "  -m, --multi-domain          ref.po uporabimo na vseh domenah iz def.po\n"
@@ -735,14 +884,17 @@ msgstr ""
 #~ "Poišče sporočila, ki so skupna dvema ali več podanima datotekama PO. Z\n"
 #~ "izbiro --more-than pred izpisom zahtevamo več skupnih lastnosti. Obratno\n"
 #~ "z izbiro --less-than izberemo manj skupnih lastnosti (npr. --less-than=2\n"
-#~ "izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in komentarji\n"
-#~ "pri izvlačenju se ohranijo samo iz prve podane datoteke PO. Mesta v datotekah \n"
+#~ "izpiše samo unikatna sporočila). Prevodi, komentarji prevajalcev in "
+#~ "komentarji\n"
+#~ "pri izvlačenju se ohranijo samo iz prve podane datoteke PO. Mesta v "
+#~ "datotekah \n"
 #~ "se ohranijo iz vseh datotek PO.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -750,38 +902,51 @@ msgstr ""
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Izbira sporočil:\n"
-#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO definicij\n"
+#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je neskončno)\n"
-#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je 1)\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo "
+#~ "samo\n"
 #~ "                                 enolično definirana sporočila\n"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -807,23 +972,28 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -844,20 +1014,25 @@ msgstr ""
 #~ "xgettext).  Untranslated entries are assigned a translation that is\n"
 #~ "identical to the msgid, and are marked fuzzy.\n"
 #~ msgstr ""
-#~ "Ustvarimo katalog angleških sporočil. Vhodna datoteka je nazadnje ustvarjena\n"
-#~ "angleška datoteka PO ali vzorčna datoteka POT (slednjo navadno ustvarimo z\n"
-#~ "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
+#~ "Ustvarimo katalog angleških sporočil. Vhodna datoteka je nazadnje "
+#~ "ustvarjena\n"
+#~ "angleška datoteka PO ali vzorčna datoteka POT (slednjo navadno ustvarimo "
+#~ "z\n"
+#~ "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak "
+#~ "izvirniku\n"
 #~ "msgid; taki prevodi so označeni kot ohlapni.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO or POT file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid "missing command name"
@@ -879,21 +1054,26 @@ msgstr ""
 #~ "koda programa msgexec je največja od izhodnih kod pri klicu ukaza.\n"
 
 #~ 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"
+#~ "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 ""
-#~ "Poseben vgrajen ukaz ,0` izpiše prevod in izpis zaključi z znakom s kodo nič.\n"
+#~ "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"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  -i, --input=INPUTFILE       input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid "write to stdout failed"
@@ -915,22 +1095,27 @@ msgstr ""
 #~ msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
 
 #~ msgid ""
-#~ "The FILTER can be any program that reads a translation from standard input\n"
+#~ "The FILTER can be any program that reads a translation from standard "
+#~ "input\n"
 #~ "and writes a modified translation to standard output.\n"
 #~ msgstr ""
-#~ "FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n"
+#~ "FILTER je lahko ime kateregakoli programa, ki prebere prevod s "
+#~ "standardnega\n"
 #~ "vhoda in izpiše spremnjen prevod na standardni izhod.\n"
 
 #~ msgid ""
 #~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 #~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+#~ "commands\n"
 #~ "                                to be executed\n"
-#~ "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern "
+#~ "space\n"
 #~ msgstr ""
 #~ "Uporabne IZBIRE FILTRA, kadar je FILTER ,sed`:\n"
 #~ "  -e, --expression=SKRIPT     dodaj SKRIPT med ukaze, ki se izvedejo\n"
-#~ "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
+#~ "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med "
+#~ "ukaze,\n"
 #~ "                                ki se izvedejo\n"
 #~ "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
@@ -940,25 +1125,31 @@ msgstr ""
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "      --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -1015,31 +1206,38 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] filename.po ...\n"
 #~ msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#~ msgid "Generate binary message catalog from textual translation description.\n"
+#~ msgid ""
+#~ "Generate binary message catalog from textual translation description.\n"
 #~ msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporočil.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  filename.po ...             input files\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+#~ "higher)\n"
 #~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 #~ msgstr ""
 #~ "Način delovanja:\n"
 #~ "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 #~ "                                ResourceBundle\n"
-#~ "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali več)\n"
-#~ "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
+#~ "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
+#~ "več)\n"
+#~ "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat ."
+#~ "msg\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
@@ -1049,15 +1247,19 @@ msgstr ""
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "      --strict                izpis v strogi obliki Uniforum brez razširitev GNU\n"
+#~ "      --strict                izpis v strogi obliki Uniforum brez "
+#~ "razširitev GNU\n"
 #~ "Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
 
 #~ msgid ""
 #~ "Output file location in Java mode:\n"
 #~ "  -r, --resource=RESOURCE     resource name\n"
-#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-#~ "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-#~ "The class name is determined by appending the locale name to the resource name,\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of classes directory "
+#~ "hierarchy\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
 #~ "separated with an underscore.  The -d option is mandatory.  The class is\n"
 #~ "written under the specified directory.\n"
 #~ msgstr ""
@@ -1065,13 +1267,16 @@ msgstr ""
 #~ "  -r, --resource=SREDSTVO     ime sredstva\n"
 #~ "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 #~ "  -d IMENIK                   korenski imenik hierarhije razredov\n"
-#~ "Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s podčrtajem,\n"
-#~ "pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapiše v podani\n"
+#~ "Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s "
+#~ "podčrtajem,\n"
+#~ "pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapiše v "
+#~ "podani\n"
 #~ "imenik.\n"
 
 #~ msgid ""
 #~ "Output file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
 #~ "specified directory.\n"
@@ -1084,36 +1289,50 @@ msgstr ""
 #~ msgid ""
 #~ "Input file interpretation:\n"
 #~ "  -c, --check                 perform all the checks implied by\n"
-#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          check language dependent format strings\n"
-#~ "      --check-header          verify presence and contents of the header entry\n"
-#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "      --check-header          verify presence and contents of the header "
+#~ "entry\n"
+#~ "      --check-domain          check for conflicts between domain "
+#~ "directives\n"
 #~ "                                and the --output-file option\n"
-#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
+#~ "accelerators for\n"
 #~ "                                menu items\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ msgstr ""
 #~ "Interpretacija vhodne datoteke:\n"
-#~ "  -c, --check                 opravimo vse preizkuse, določene z izbiramo\n"
-#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "  -c, --check                 opravimo vse preizkuse, določene z "
+#~ "izbiramo\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          preverimo od jezika odvisne formatne nize\n"
 #~ "      --check-header          preverimo obstoj in vsebino glave\n"
-#~ "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
+#~ "      --check-domain          preverimo morebitna nesoglasja med "
+#~ "direktivo\n"
 #~ "                                domene in izbiro --output-file\n"
-#~ "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open msgfmt\n"
+#~ "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
+#~ "msgfmt\n"
 #~ "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 #~ "                                menujske izbire\n"
-#~ "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
+#~ "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene "
+#~ "prevode\n"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov (privzeto %d)\n"
-#~ "      --no-hash               binarni katalog sporočil bo brez razpršene tabele\n"
+#~ "  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov "
+#~ "(privzeto %d)\n"
+#~ "      --no-hash               binarni katalog sporočil bo brez razpršene "
+#~ "tabele\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -1129,10 +1348,14 @@ msgstr ""
 #~ "  -v, --verbose               z dodatnimi sporočili med izvajanjem\n"
 
 #~ msgid "plural expression can produce negative values"
-#~ msgstr "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
+#~ msgstr ""
+#~ "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
 
-#~ 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"
+#~ 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"
 
 #~ msgid "plural expression can produce division by zero"
 #~ msgstr "izraz za izbiro množinske oblike lahko povzroči deljenje z nič"
@@ -1140,9 +1363,12 @@ msgstr ""
 #~ msgid "plural expression can produce integer overflow"
 #~ msgstr "izraz za izbiro množinske oblike lahko povzroči prekoračitev obsega"
 
-#~ msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#~ msgid ""
+#~ "plural expression can produce arithmetic exceptions, possibly division by "
+#~ "zero"
 #~ msgstr ""
-#~ "izraz za izbiro množinske oblike lahko povzroči aritmetične napake, morda\n"
+#~ "izraz za izbiro množinske oblike lahko povzroči aritmetične napake, "
+#~ "morda\n"
 #~ "deljenje z nič"
 
 #~ msgid "message catalog has plural form translations..."
@@ -1190,7 +1416,9 @@ msgstr ""
 #~ msgid "Try using the following, valid for %s:\n"
 #~ msgstr "Poskusite uporabiti naslednje, veljavno za %s:\n"
 
-#~ msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#~ msgid ""
+#~ "message catalog has plural form translations, but lacks a header entry "
+#~ "with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 #~ msgstr ""
 #~ "katalog sporočil vsebuje množinske oblike, manjka pa glava z določili\n"
 #~ "\"Plural-Forms: nplurals=ŠTEVILO; plural=IZRAZ;\""
@@ -1268,22 +1496,27 @@ msgstr ""
 #~ msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
 #~ msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
-#~ msgstr "izbire ,%c` ni moč uporabiti, preden sta izbrana bodisi ,K` bodisi ,T`"
+#~ msgstr ""
+#~ "izbire ,%c` ni moč uporabiti, preden sta izbrana bodisi ,K` bodisi ,T`"
 
 #~ msgid ""
-#~ "Extracts all messages of a translation catalog that match a given pattern\n"
+#~ "Extracts all messages of a translation catalog that match a given "
+#~ "pattern\n"
 #~ "or belong to some given source files.\n"
 #~ msgstr ""
-#~ "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
+#~ "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu "
+#~ "ali\n"
 #~ "pripadajo dani izvorni datoteki.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
 #~ "  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
-#~ "A message is selected if it comes from one of the specified source files,\n"
+#~ "A message is selected if it comes from one of the specified source "
+#~ "files,\n"
 #~ "or if it comes from one of the specified domains,\n"
-#~ "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
+#~ "or if -K is given and its key (msgid or msgid_plural) matches MSGID-"
+#~ "PATTERN,\n"
 #~ "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
 #~ "or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
 #~ "\n"
@@ -1296,11 +1529,13 @@ msgstr ""
 #~ "expressions if -E is given, or fixed strings if -F is given.\n"
 #~ "\n"
 #~ "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
-#~ "  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+#~ "  -M, --domain=DOMAINNAME     select messages belonging to domain "
+#~ "DOMAINNAME\n"
 #~ "  -K, --msgid                 start of patterns for the msgid\n"
 #~ "  -T, --msgstr                start of patterns for the msgstr\n"
 #~ "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
-#~ "  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
+#~ "  -F, --fixed-strings         PATTERN is a set of newline-separated "
+#~ "strings\n"
 #~ "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
 #~ "  -f, --file=FILE             obtain PATTERN from FILE\n"
 #~ "  -i, --ignore-case           ignore case distinctions\n"
@@ -1312,20 +1547,25 @@ msgstr ""
 #~ "ali če izvira iz ene od navedenih domen,\n"
 #~ "ali če je podana izbira -K in izvorna sporočila (msgid ali msgid_plural)\n"
 #~ "ustrezajo podanemu vzorcu,\n"
-#~ "ali če je podana izbira -T in prevodi sporočil (msgstr) ustrezajo podanemu\n"
+#~ "ali če je podana izbira -T in prevodi sporočil (msgstr) ustrezajo "
+#~ "podanemu\n"
 #~ "vzorcu,\n"
-#~ "ali če je podana izbira -C in in prevajačevi komentarji ustrezajo podanemu\n"
+#~ "ali če je podana izbira -C in in prevajačevi komentarji ustrezajo "
+#~ "podanemu\n"
 #~ "vzorcu.\n"
 #~ "\n"
-#~ "Če je podan več kot en pogoj, je množica izbranih sporočil unija izbranih\n"
+#~ "Če je podan več kot en pogoj, je množica izbranih sporočil unija "
+#~ "izbranih\n"
 #~ "sporočil za posamezni pogoj.\n"
 #~ "\n"
 #~ "Skladnja vzorca msgid ali vzorca msgstr:\n"
 #~ "  [-E | -F] [-e VZOREC | -f DATOTEKA]...\n"
-#~ "VZOREC je navadni regularni izraz. Razširjene regularne izraze dovolimo s\n"
+#~ "VZOREC je navadni regularni izraz. Razširjene regularne izraze dovolimo "
+#~ "s\n"
 #~ "stikalom -E, s stikalom -F pa izbiro skrčimo na konstantne nize znakov.\n"
 #~ "\n"
-#~ "  -N, --location=IZVORNA_DATOTEKA  izberemo sporočila, izvlečena iz navedene\n"
+#~ "  -N, --location=IZVORNA_DATOTEKA  izberemo sporočila, izvlečena iz "
+#~ "navedene\n"
 #~ "                                IZVORNE DATOTEKE\n"
 #~ "  -M, --domain=DOMENA         izberemo sporočila iz podane DOMENE\n"
 #~ "  -K, --msgid                 začetek vzorca msgid\n"
@@ -1335,7 +1575,8 @@ msgstr ""
 #~ "                                znakom za novo vrstico\n"
 #~ "  -e, --regexp=VZOREC         uporabimo VZOREC kot regularni izraz\n"
 #~ "  -f, --file=DATOTEKA         VZOREC preberemo iz navedene datoteke\n"
-#~ "  -i, --ignore-case           ne razlikujemo med velikimi in malimi črkami\n"
+#~ "  -i, --ignore-case           ne razlikujemo med velikimi in malimi "
+#~ "črkami\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -1344,23 +1585,28 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "      --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "      --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "      --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -1391,7 +1637,8 @@ msgstr ""
 #~ msgstr "Ustvarjena datoteka %s.\n"
 
 #~ msgid ""
-#~ "Creates a new PO file, initializing the meta information with values from the\n"
+#~ "Creates a new PO file, initializing the meta information with values from "
+#~ "the\n"
 #~ "user's environment.\n"
 #~ msgstr ""
 #~ "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n"
@@ -1400,37 +1647,45 @@ msgstr ""
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  -i, --input=INPUTFILE       input POT file\n"
-#~ "If no input file is given, the current directory is searched for the POT file.\n"
+#~ "If no input file is given, the current directory is searched for the POT "
+#~ "file.\n"
 #~ "If it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
-#~ "Če vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem imeniku.\n"
+#~ "Če vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem "
+#~ "imeniku.\n"
 #~ "Če je enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE      write output to specified PO file\n"
-#~ "If no output file is given, it depends on the --locale option or the user's\n"
+#~ "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 ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana, se uporabi vrednost izbire --locale ali pa\n"
-#~ "nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna datoteka \n"
+#~ "Če izhodna datoteka ni podana, se uporabi vrednost izbire --locale ali "
+#~ "pa\n"
+#~ "nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna "
+#~ "datoteka \n"
 #~ "podan -, se rezultat izpiše na standardni izhod.\n"
 
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -l, --locale=LL_CC          set target locale\n"
-#~ "      --no-translator         assume the PO file is automatically generated\n"
+#~ "      --no-translator         assume the PO file is automatically "
+#~ "generated\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
 #~ "  -l, --locale=JJ_DD          določitev ciljnega jezikovnega okolja\n"
-#~ "      --no-translator         privzamemo, da je datoteka PO samodejno ustvarjena\n"
+#~ "      --no-translator         privzamemo, da je datoteka PO samodejno "
+#~ "ustvarjena\n"
 #~ "  -w, --width=ŠTEVILO         širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap               brez deljenja dolgih sporočil v več vrstic\n"
 
@@ -1461,8 +1716,10 @@ msgstr ""
 #~ msgstr "podproces %s neuspešen z izhodno kodo %d"
 
 #~ msgid ""
-#~ "The new message catalog should contain your email address, so that users can\n"
-#~ "give you feedback about the translations, and so that maintainers can contact\n"
+#~ "The new message catalog should contain your email address, so that users "
+#~ "can\n"
+#~ "give you feedback about the translations, and so that maintainers can "
+#~ "contact\n"
 #~ "you in case of unexpected technical problems.\n"
 #~ msgstr ""
 #~ "Novi katalog sporočil naj vsebuje vaš epoštni naslov, tako da se lahko\n"
@@ -1478,11 +1735,17 @@ msgstr ""
 #~ msgid "two different charsets \"%s\" and \"%s\" in input file"
 #~ msgstr "v vhodni datoteki sta dva različna nabora znakov, \"%s\" in \"%s\""
 
-#~ msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#~ 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"
 
-#~ msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
-#~ msgstr "domena \"%s\" v vhodni datoteki ,%s` ne vsebuje glave z določitvijo nabora znakov<"
+#~ msgid ""
+#~ "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+#~ "charset specification"
+#~ msgstr ""
+#~ "domena \"%s\" v vhodni datoteki ,%s` ne vsebuje glave z določitvijo "
+#~ "nabora znakov<"
 
 #~ msgid "target charset \"%s\" is not a portable encoding name."
 #~ msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
@@ -1494,15 +1757,18 @@ msgstr ""
 #~ "Input files contain messages in different encodings, UTF-8 among others.\n"
 #~ "Converting the output to UTF-8.\n"
 #~ msgstr ""
-#~ "Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med drugim UTF8.\n"
+#~ "Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med "
+#~ "drugim UTF8.\n"
 #~ "Izhod je pretvorjen v UTF8.\n"
 
 #~ msgid ""
-#~ "Input files contain messages in different encodings, %s and %s among others.\n"
+#~ "Input files contain messages in different encodings, %s and %s among "
+#~ "others.\n"
 #~ "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"
 
@@ -1552,14 +1818,23 @@ msgstr ""
 #~ msgid "conversion failure"
 #~ msgstr "pretvorba neuspešna"
 
-#~ msgid "input file doesn't contain a header entry with a charset specification"
+#~ msgid ""
+#~ "input file doesn't contain a header entry with a charset specification"
 #~ msgstr "v vhodni datoteki manjka glava z določilom kodnega nabora"
 
-#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-#~ msgstr "Pretvorba iz \"%s\" v \"%s\" ni mogoča. %s kliče iconv(), ta pa ne podpira te pretvorbe."
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
+#~ msgstr ""
+#~ "Pretvorba iz \"%s\" v \"%s\" ni mogoča. %s kliče iconv(), ta pa ne "
+#~ "podpira te pretvorbe."
 
-#~ 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()."
+#~ 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()."
 
 #~ msgid "backup type"
 #~ msgstr "vrsta varnostne kopije"
@@ -1568,7 +1843,8 @@ msgstr ""
 #~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
 #~ "existing PO file with translations which will be taken over to the newly\n"
 #~ "created file as long as they still match; comments will be preserved,\n"
-#~ "but extracted comments and file positions will be discarded.  The ref.pot\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
 #~ "file is the last created PO file with up-to-date source references but\n"
 #~ "old translations, or a PO Template file (generally created by xgettext);\n"
 #~ "any translations or comments in the file will be discarded, however dot\n"
@@ -1577,27 +1853,35 @@ msgstr ""
 #~ msgstr ""
 #~ "Združi dve datoteki .po v obliki Uniforum. Datoteka def.po je obstoječa\n"
 #~ "datoteka s starimi prevodi, ki bodo, kadar se ujemajo, preneseni v novo\n"
-#~ "datoteko. Pri prevedbi se komentarji prevajalca ohranijo, strojno ustvarjeni\n"
-#~ "komentarji in podatki o številki vrstice pa ne. Datoteka ref.po je bodisi\n"
+#~ "datoteko. Pri prevedbi se komentarji prevajalca ohranijo, strojno "
+#~ "ustvarjeni\n"
+#~ "komentarji in podatki o številki vrstice pa ne. Datoteka ref.po je "
+#~ "bodisi\n"
 #~ "nazadnje ustvarjena datoteka PO z najnovejšimi sklici na vire, a starimi\n"
 #~ "prevodi, bodisi vzorčna datoteka PO (navadno ustvarjena z xgettext).\n"
-#~ "Kakršnikoli prevodi ali komentarji prevajalca v njej bodo zavrženi, ohranjeni\n"
-#~ "pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. Kjer\n"
+#~ "Kakršnikoli prevodi ali komentarji prevajalca v njej bodo zavrženi, "
+#~ "ohranjeni\n"
+#~ "pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. "
+#~ "Kjer\n"
 #~ "natančnega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  def.po                      translations referring to old sources\n"
 #~ "  ref.pot                     references to new sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
 #~ "                              may be specified more than once\n"
 #~ msgstr ""
 #~ "Izbira vhodnih datotek:\n"
 #~ "  def.po                      prevodi\n"
 #~ "  ref.pot                     sklici na vire\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
-#~ "  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; navedemo\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
+#~ "  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; "
+#~ "navedemo\n"
 #~ "                                lahko več kot eno\n"
 
 #~ msgid ""
@@ -1614,22 +1898,26 @@ msgstr ""
 #~ "The result is written back to def.po.\n"
 #~ "      --backup=CONTROL        make a backup of def.po\n"
 #~ "      --suffix=SUFFIX         override the usual backup suffix\n"
-#~ "The version control method may be selected via the --backup option or through\n"
+#~ "The version control method may be selected via the --backup option or "
+#~ "through\n"
 #~ "the VERSION_CONTROL environment variable.  Here are the values:\n"
 #~ "  none, off       never make backups (even if --backup is given)\n"
 #~ "  numbered, t     make numbered backups\n"
 #~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 #~ "  simple, never   always make simple backups\n"
-#~ "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+#~ "The backup suffix is `~', unless set with --suffix or the "
+#~ "SIMPLE_BACKUP_SUFFIX\n"
 #~ "environment variable.\n"
 #~ msgstr ""
 #~ "Mesto izhodne datoteke v posodobitvenem načinu:\n"
 #~ "Rezultat se zapiše nazaj v datoteko def.po.\n"
 #~ "      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
 #~ "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
-#~ "Vrsto varnostnih kopij lahko nastavimo z izbiro --backup ali spremenljivko\n"
+#~ "Vrsto varnostnih kopij lahko nastavimo z izbiro --backup ali "
+#~ "spremenljivko\n"
 #~ "VERSION_CONTROL. Možnosti so:\n"
-#~ "  none, off       nikoli ne delamo varnostne kopije, niti z izbiro --backup\n"
+#~ "  none, off       nikoli ne delamo varnostne kopije, niti z izbiro --"
+#~ "backup\n"
 #~ "  numbered, t     oštevilčene varnostne kopije\n"
 #~ "  existing, nil   oštevilčene varnostne kopije, če take že obstajajo,\n"
 #~ "                  sicer enostavne\n"
@@ -1656,8 +1944,12 @@ msgstr ""
 #~ msgid "this message should not define plural forms"
 #~ msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
 
-#~ msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-#~ msgstr "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, manjkajočih %ld, opuščenih %ld.\n"
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, "
+#~ "manjkajočih %ld, opuščenih %ld.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " opravljeno.\n"
@@ -1666,17 +1958,20 @@ msgstr ""
 #~ msgstr "%s in izrecna imena datotek se med seboj izključujejo"
 
 #~ 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"
+#~ msgstr ""
+#~ "Pretvorba kataloga sporočil iz binarne oblike .mo v obliko Uniforum .po.\n"
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java               Java mode: input is a Java ResourceBundle class\n"
+#~ "  -j, --java               Java mode: input is a Java ResourceBundle "
+#~ "class\n"
 #~ "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
 #~ msgstr ""
 #~ "Način delovanja:\n"
 #~ "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 #~ "                                ResourceBundle\n"
-#~ "      --tcl                   način tcl: vhod je datoteka tcl/msgcat .msg\n"
+#~ "      --tcl                   način tcl: vhod je datoteka tcl/msgcat ."
+#~ "msg\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
@@ -1690,19 +1985,24 @@ msgstr ""
 #~ msgid ""
 #~ "Input file location in Java mode:\n"
 #~ "  -r, --resource=RESOURCE  resource name\n"
-#~ "  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-#~ "The class name is determined by appending the locale name to the resource name,\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
 #~ "separated with an underscore.  The class is located using the CLASSPATH.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke v javanskem načinu:\n"
 #~ "  -r, --resource=SREDSTVO     ime sredstva\n"
 #~ "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
-#~ "Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s podčrtajem,\n"
-#~ "pridá ime jezikovnega okolja. Razred je določen s spremenljivko CLASSPATH.\n"
+#~ "Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s "
+#~ "podčrtajem,\n"
+#~ "pridá ime jezikovnega okolja. Razred je določen s spremenljivko "
+#~ "CLASSPATH.\n"
 
 #~ msgid ""
 #~ "Input file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY             base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is located in the\n"
 #~ "specified directory.\n"
@@ -1715,12 +2015,14 @@ msgstr ""
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE   write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+#~ "standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
@@ -1741,7 +2043,8 @@ msgstr ""
 #~ "                           nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        abecedno urejen izpis\n"
@@ -1759,27 +2062,38 @@ msgstr ""
 
 #~ msgid ""
 #~ "Unifies duplicate translations in a translation catalog.\n"
-#~ "Finds duplicate translations of the same message ID.  Such duplicates are\n"
+#~ "Finds duplicate translations of the same message ID.  Such duplicates "
+#~ "are\n"
 #~ "invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
-#~ "default, duplicates are merged together.  When using the --repeated option,\n"
-#~ "only duplicates are output, and all other messages are discarded.  Comments\n"
+#~ "default, duplicates are merged together.  When using the --repeated "
+#~ "option,\n"
+#~ "only duplicates are output, and all other messages are discarded.  "
+#~ "Comments\n"
 #~ "and extracted comments will be cumulated, except that if --use-first is\n"
-#~ "specified, they will be taken from the first translation.  File positions\n"
-#~ "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
+#~ "specified, they will be taken from the first translation.  File "
+#~ "positions\n"
+#~ "will be cumulated.  When using the --unique option, duplicates are "
+#~ "discarded.\n"
 #~ msgstr ""
 #~ "Poenotenje podvojenih prevodov v katalogu sporočil.\n"
-#~ "Poiščemo podvojene prevode istega izvornega sporočila. Taki podvojeni vnosi\n"
-#~ "niso veljavni vhodni podatki za programe, kot so msgfmt, msgmerge ali msgcat.\n"
+#~ "Poiščemo podvojene prevode istega izvornega sporočila. Taki podvojeni "
+#~ "vnosi\n"
+#~ "niso veljavni vhodni podatki za programe, kot so msgfmt, msgmerge ali "
+#~ "msgcat.\n"
 #~ "Privzeto so podvojeni prevodi združeni. Z izbiro --repeated izpišemo le \n"
-#~ "podvojene prevode, drugih pa ne. Ohranijo se vsi komentarji prevajalcev ter\n"
-#~ "komentarji ob izvlačenju, razen če z izbiro --use-first ne zahtevamo, da se\n"
+#~ "podvojene prevode, drugih pa ne. Ohranijo se vsi komentarji prevajalcev "
+#~ "ter\n"
+#~ "komentarji ob izvlačenju, razen če z izbiro --use-first ne zahtevamo, da "
+#~ "se\n"
 #~ "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"
+#~ "sporočila v izvorni datoteki. Z izbiro --unique se podvojena sporočila "
+#~ "zavržejo.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -d, --repeated                 print only duplicates\n"
-#~ "  -u, --unique                   print only unique messages, discard duplicates\n"
+#~ "  -u, --unique                   print only unique messages, discard "
+#~ "duplicates\n"
 #~ msgstr ""
 #~ "Izbira sporočil:\n"
 #~ "  -d, --repeated                 izpišemo le podvojena sporočila\n"
@@ -1900,7 +2214,8 @@ msgstr ""
 #~ msgstr "Uporaba: %s [IZBIRA] URL DATOTEKA\n"
 
 #~ msgid ""
-#~ "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
+#~ "Fetches and outputs the contents of an URL.  If the URL cannot be "
+#~ "accessed,\n"
 #~ "the locally accessible FILE is used instead.\n"
 #~ msgstr ""
 #~ "Prinese in izpiše vsebino podanega URL. Če URL ni dosegljiv, se uporabni\n"
@@ -1925,13 +2240,17 @@ msgstr ""
 #~ msgstr "napaka pri pisanju na datoteko \"%s\""
 
 #~ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-#~ msgstr "prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite $JAVAC"
+#~ msgstr ""
+#~ "prevajanje javanskega razreda neuspešno, uporabite --verbose ali "
+#~ "nastavite $JAVAC"
 
 #~ msgid "error while opening \"%s\" for writing"
 #~ msgstr "napaka pri pisanju na \"%s\""
 
-#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence ,\\%c'"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence ,\\%c'"
 
 #~ msgid ""
 #~ "The following msgid contains non-ASCII characters.\n"
@@ -1939,8 +2258,10 @@ msgstr ""
 #~ "different from yours. Consider using a pure ASCII msgid instead.\n"
 #~ "%s\n"
 #~ msgstr ""
-#~ "Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora ASCII.\n"
-#~ "To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov kot\n"
+#~ "Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora "
+#~ "ASCII.\n"
+#~ "To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov "
+#~ "kot\n"
 #~ "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 #~ "%s\n"
 
@@ -1975,7 +2296,8 @@ msgstr ""
 #~ msgstr "xgettext ne deluje brez ključnih besed, ki naj jih išče"
 
 #~ 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"
 
 #~ msgid "Extract translatable strings from given input files.\n"
 #~ msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
@@ -1989,31 +2311,41 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output file location:\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
 #~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
-#~ "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
+#~ "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA."
+#~ "po\n"
 #~ "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni IMENIK\n"
+#~ "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni "
+#~ "IMENIK\n"
 #~ "Če je kot izhodna datoteka navedeno -, se rezultat izpiše na standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Choice of input file language:\n"
 #~ "  -L, --language=NAME            recognise the specified language\n"
-#~ "                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
-#~ "                                   EmacsLisp, librep, Java, awk, YCP, Tcl,\n"
+#~ "                                   (C, C++, ObjectiveC, PO, Python, "
+#~ "Lisp,\n"
+#~ "                                   EmacsLisp, librep, Java, awk, YCP, "
+#~ "Tcl,\n"
 #~ "                                   RST, Glade)\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "By default the language is guessed depending on the input file name extension.\n"
+#~ "By default the language is guessed depending on the input file name "
+#~ "extension.\n"
 #~ msgstr ""
 #~ "Izbira vhodnega jezika:\n"
-#~ "  -L, --language=JEZIK           obravnavaj vhodno datoteko v danem JEZIKU\n"
-#~ "                                   (C, C++, objektni C, PO, lisp, emacs lisp,\n"
-#~ "                                    librep, java, awk, YCP, TCL, RST, glade)\n"
+#~ "  -L, --language=JEZIK           obravnavaj vhodno datoteko v danem "
+#~ "JEZIKU\n"
+#~ "                                   (C, C++, objektni C, PO, lisp, emacs "
+#~ "lisp,\n"
+#~ "                                    librep, java, awk, YCP, TCL, RST, "
+#~ "glade)\n"
 #~ "  -C, --c++                      okrajšava za --language=C++\n"
 #~ "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
 
@@ -2026,21 +2358,27 @@ msgstr ""
 #~ msgstr ""
 #~ "Način delovanja:\n"
 #~ "  -j, --join-existing            združi sporočila z obstoječo datoteko\n"
-#~ "  -x, --exclude-file=DATOTEKA.po  vnosov iz navedene DATOTEKE ne izvlečemo\n"
-#~ "  -c, --add-comments[=ZNAČKA]    v vhodno datoteko dodamo komentar z navedeno\n"
+#~ "  -x, --exclude-file=DATOTEKA.po  vnosov iz navedene DATOTEKE ne "
+#~ "izvlečemo\n"
+#~ "  -c, --add-comments[=ZNAČKA]    v vhodno datoteko dodamo komentar z "
+#~ "navedeno\n"
 #~ "                                  ZNAČKO\n"
 
 #~ msgid ""
 #~ "Language=C/C++ specific options:\n"
 #~ "  -a, --extract-all              extract all strings\n"
-#~ "  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "      --debug                    more detailed formatstring recognition result\n"
+#~ "      --debug                    more detailed formatstring recognition "
+#~ "result\n"
 #~ msgstr ""
 #~ "  -a, --extract-all              iz datotek potegnemo vse nize\n"
-#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah (prazen\n"
-#~ "                                   niz BESEDA pomeni brez uporabe privzetih\n"
+#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
+#~ "(prazen\n"
+#~ "                                   niz BESEDA pomeni brez uporabe "
+#~ "privzetih\n"
 #~ "                                   ključnih besed)\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
 #~ "      --debug                    bolj razčlenjen rezultat razpoznave\n"
@@ -2048,40 +2386,55 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
 #~ "  -F, --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 #~ "      --omit-header        brez glave z vnosom \"msgid\"\n"
-#~ "      --copyright-holder=NIZ  v izhodu nastavimo nosilca avtorskih pravic na NIZ\n"
-#~ "      --foreign-user       brez copyrighta FSF v izpisu za tuje uporabnike\n"
+#~ "      --copyright-holder=NIZ  v izhodu nastavimo nosilca avtorskih pravic "
+#~ "na NIZ\n"
+#~ "      --foreign-user       brez copyrighta FSF v izpisu za tuje "
+#~ "uporabnike\n"
 #~ "  -m, --msgstr-prefix[=NIZ]  NIZ ali \"\" kot predpona za msgstr\n"
 #~ "  -m, --msgstr-suffix[=NIZ]  NIZ ali \"\" kot pripona za msgstr\n"
 
@@ -2105,7 +2458,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java               Java mode: generate a Java ResourceBundle class\n"
+#~ "  -j, --java               Java mode: generate a Java ResourceBundle "
+#~ "class\n"
 #~ msgstr ""
 #~ "Način delovanja:\n"
 #~ "  -j, --java                  javanski način: ustvarimo javanski razred\n"
@@ -2130,10 +2484,14 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
@@ -2142,11 +2500,15 @@ msgstr ""
 #~ "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA ...\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
 #~ "  -d, --default-domain=IME       izhod na IME.po (namesto messages.po)\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku IMENIK\n"
-#~ "  -e, --no-escape                brez ubežnih sekvenc v obliki C (privzeto)\n"
-#~ "  -E, --escape                   z ubežnimi sekvencami C, brez razširjenega\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku "
+#~ "IMENIK\n"
+#~ "  -e, --no-escape                brez ubežnih sekvenc v obliki C "
+#~ "(privzeto)\n"
+#~ "  -E, --escape                   z ubežnimi sekvencami C, brez "
+#~ "razširjenega\n"
 #~ "                                 nabora znakov\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z DATOTEKE\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z "
+#~ "DATOTEKE\n"
 #~ "      --force-po                 datoteko PO zapišemo, četudi je prazna\n"
 #~ "  -F, --sort-by-file             izhod uredimo po lokaciji datotek\n"
 #~ "  -h, --help                     ta navodila\n"
@@ -2155,26 +2517,35 @@ msgstr ""
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -i, --indent                   oblika datoteke PO z zamiki od levega roba\n"
+#~ "  -i, --indent                   oblika datoteke PO z zamiki od levega "
+#~ "roba\n"
 #~ "      --no-location              brezz vrstic ,#: filename:line`\n"
-#~ "  -n, --add-location             z vrsticami ,#: filename:line` (privzeto)\n"
+#~ "  -n, --add-location             z vrsticami ,#: filename:line` "
+#~ "(privzeto)\n"
 #~ "      --omit-header              brez glave z ,msgid \"\"`\n"
 #~ "  -p, --output=DATOTEKA          izhod zapišemo v podano DATOTEKO\n"
 #~ "  -p, --output-dir=IMENIK        izhodne datoteke zapisane v IMENIK\n"
 #~ "  -s, --sort-output              urejen izpis brez podvojenih vnosov\n"
-#~ "      --strict                   izpis datoteke .po v strogi obliki Uniforum\n"
+#~ "      --strict                   izpis datoteke .po v strogi obliki "
+#~ "Uniforum\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, zahtevamo izpis\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, zahtevamo "
+#~ "izpis\n"
 #~ "                                 zgolj unikatnih sporočil\n"
 
 #~ msgid ""
@@ -2182,12 +2553,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -2203,7 +2578,8 @@ msgstr ""
 #~ "Tekstovni opis prevodov prevedemo v binarni katalog sporočil.\n"
 #~ "\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
-#~ "  -a, --alignment=ŠTEVILO  poravnaj nize znakov na ŠTEVILO bytov (privzeto: %d)\n"
+#~ "  -a, --alignment=ŠTEVILO  poravnaj nize znakov na ŠTEVILO bytov "
+#~ "(privzeto: %d)\n"
 #~ "  -c, --check              na nizih izvedi teste, odvisne od jezika\n"
 #~ "  -D, --directory=IMENIK   vhodne datoteke iščemo tudi v imeniku IMENIK\n"
 #~ "  -f, --use-fuzzy          uporaba ohlapnih prevodov pri izpisu\n"
@@ -2217,8 +2593,10 @@ msgstr ""
 #~ "\n"
 #~ "Večkratna izbira -v poveča raven komentarjev ob delovanju.\n"
 #~ "\n"
-#~ "Če je kot ime vhodne datoteke navedeno - (minus), program bere s standardnega\n"
-#~ "vhoda. Če je kot ime izhodne datoteke navedeno - (minus), program piše na\n"
+#~ "Če je kot ime vhodne datoteke navedeno - (minus), program bere s "
+#~ "standardnega\n"
+#~ "vhoda. Če je kot ime izhodne datoteke navedeno - (minus), program piše "
+#~ "na\n"
 #~ "standardni izhod.\n"
 
 #~ msgid "while creating hash table"
@@ -2241,7 +2619,8 @@ msgstr ""
 #~ "\n"
 #~ "Pretvorba datoteke iz binarne oblike .mo v obliko Uniforum .po\n"
 #~ "Datoteke .mo so lahko little-endian ali big-endian.\n"
-#~ "Če vhodna datoteka ni podana, ali pa je podano ime -, beremo standardni vhod.\n"
+#~ "Če vhodna datoteka ni podana, ali pa je podano ime -, beremo standardni "
+#~ "vhod.\n"
 #~ "Če ni izbrano drugače, gre izpis na standardni izhod.\n"
 
 #  POZOR!  Nepopolni prevodi
@@ -2254,31 +2633,44 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA ...\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
 #~ "  -a, --extract-all              iz datotek potegnemo vse nize\n"
 #~ "  -c, --add-comments[=ZNAČKA]    komentarji označeni z ZNAČKO (ali tisti\n"
-#~ "                                 pred vrsticami s ključnimi besedami) naj se\n"
+#~ "                                 pred vrsticami s ključnimi besedami) naj "
+#~ "se\n"
 #~ "                                 izpišejo\n"
 #~ "  -C, --c++                      okrajšava za --language=C++\n"
-#~ "  -d, --default-domain=IME       izhod na IME.po (namesto na messages.po)\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku IMENIK\n"
-#~ "  -e, --no-escape                brez ubežnih sekvenc v stilu C (privzeto)\n"
-#~ "  -E, --escape                   z ubežnimi sekvencami C, brez razširjenega\n"
+#~ "  -d, --default-domain=IME       izhod na IME.po (namesto na messages."
+#~ "po)\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku "
+#~ "IMENIK\n"
+#~ "  -e, --no-escape                brez ubežnih sekvenc v stilu C "
+#~ "(privzeto)\n"
+#~ "  -E, --escape                   z ubežnimi sekvencami C, brez "
+#~ "razširjenega\n"
 #~ "                                 nabora znakov\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z DATOTEKE\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z "
+#~ "DATOTEKE\n"
 #~ "      --force-po                 datoteko PO zapišemo, četudi je prazna\n"
-#~ "      --foreign-user             brez sporočila FSF v izhodni datoteki za\n"
+#~ "      --foreign-user             brez sporočila FSF v izhodni datoteki "
+#~ "za\n"
 #~ "                                 tujega uporabnika\n"
 #~ "  -F, --sort-by-file             izhod sortiramo po lokaciji datotek\n"
 
@@ -2286,21 +2678,30 @@ msgstr ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                     ta navodila\n"
-#~ "  -i, --indent                   izpis datoteke PO z zamiki od levega roba\n"
+#~ "  -i, --indent                   izpis datoteke PO z zamiki od levega "
+#~ "roba\n"
 #~ "  -j, --join-existing            združi sporočila z obstoječo datoteko\n"
-#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah (prazen\n"
-#~ "                                 niz BESEDA pomeni brez uporabe privzetih\n"
+#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
+#~ "(prazen\n"
+#~ "                                 niz BESEDA pomeni brez uporabe "
+#~ "privzetih\n"
 #~ "                                 ključnih besed)\n"
-#~ "  -L, --language=JEZIK           izrecno navedemo programski JEZIK (C, C++, PO);\n"
+#~ "  -L, --language=JEZIK           izrecno navedemo programski JEZIK (C, C+"
+#~ "+, PO);\n"
 #~ "                                 sicer ga poskusimo uganiti iz pripone\n"
 #~ "  -m, --msgstr-prefix[=NIZ]      NIZ ali \"\" kot predpona za msgstr\n"
 #~ "  -M, --msgstr-suffix[=NIZ]      NIZ ali \"\" kot pripona za msgstr\n"
@@ -2308,12 +2709,17 @@ msgstr ""
 
 #  POZOR!  Nepopolni prevodi
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -2321,12 +2727,14 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             z vrsticami '#: filename:line' (privzeto)\n"
+#~ "  -n, --add-location             z vrsticami '#: filename:"
+#~ "line' (privzeto)\n"
 #~ "      --omit-header              brez glave z ,msgid \"\"'\n"
 #~ "  -o, --output=DATOTEKA          izhod zapišemo na podano DATOTEKO\n"
 #~ "  -p, --output-dir=IMENIK        izhodne datoteke zapisane v IMENIK\n"
 #~ "  -s, --sort-output              urejen izpis brez podvojenih vnosov\n"
-#~ "      --strict                   strogi stil Uniforum pri izpisu datoteke .po\n"
+#~ "      --strict                   strogi stil Uniforum pri izpisu "
+#~ "datoteke .po\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
 #~ "  -V, --version                  verzija programa\n"
 #~ "  -w, --width=ŠTEVILO            širina vrstice pri izpisu, v znakih\n"
@@ -2338,7 +2746,9 @@ msgstr ""
 #~ msgstr "%s:%d: opozorilo: gnezdena ključna beseda v argumentu"
 
 #~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr "%s:%d: opozorilo: ključna beseda med zun. ključno besedo in njenim argumentom"
+#~ msgstr ""
+#~ "%s:%d: opozorilo: ključna beseda med zun. ključno besedo in njenim "
+#~ "argumentom"
 
 #, fuzzy
 #~ msgid ""
diff --git a/gettext-runtime/po/sr.po b/gettext-runtime/po/sr.po
index 530a7e54f..754e49f0a 100644
--- a/gettext-runtime/po/sr.po
+++ b/gettext-runtime/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-12-23 19:25+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,87 +15,73 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ је нејасна; могућности:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: опција „%s“ је нејасна\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: опција „%s“ је нејасна; могућности:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: непрепознатљива опција „%c%s“\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: опција „--%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непрепознатљива опција „--%s“\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непрепознатљива опција „%c%s“\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција —— „%c“\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент —— „%c“\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „-W %s“ захтева аргумент\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија је потрошена"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -104,7 +90,7 @@ msgstr ""
 "Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
 "Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написао је %s.\n"
@@ -114,57 +100,57 @@ msgstr "Написао је %s.\n"
 msgid "Bruno Haible"
 msgstr "Бруно Хејбл"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "недостају аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Употреба: %s [ОПЦИЈА] [ФОРМАТ-ЉУСКЕ]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Замењује вредности променљивих из окружења.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Начин рада:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             исписује променљиве из ФОРМАТА-ЉУСКЕ\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  приказује ову помоћ и излази\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               исписује податке о издању и излази\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -180,7 +166,7 @@ msgstr ""
 "наведене се замењују; иначе, све променљиве окружења наведене у стандардном\n"
 "улазу се замењују.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -193,25 +179,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "стандардни улаз"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -220,33 +206,56 @@ msgstr ""
 "Употреба: %s [ОПЦИЈА] [[ДОМЕН ТЕКСТА] МСГИД]\n"
 "или:      %s [ОПЦИЈА] -s [МСГИД]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Приказује превод текстуалне поруке на матерњем језику.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
-"  -e                        укључује употребу неких нарочитих низова\n"
-"  -E                        (занемарено ради сагласности)\n"
-"  -h, --help                приказује ову помоћ и излази\n"
-"  -n                        одбацује пратећи знак за нови ред\n"
-"  -V, --version             приказује податке о издању и излази\n"
-"  [ДОМЕНТЕКСТА] МСГИД       користи преведену поруку за МСГИД из \n"
-"                            ДОМЕНТЕКСТА\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  приказује ову помоћ и излази\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               исписује податке о издању и излази\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -267,12 +276,12 @@ msgstr ""
 "које постоје у изабраном каталогу се преводе.\n"
 "Уобичајени директоријум за тражење је: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Употреба: %s [ОПЦИЈА] [ДОМЕНТЕКСТА] МСГИД БРОЈ МСГИД-МНОЖИНА\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -281,29 +290,31 @@ msgstr ""
 "Приказује превод на матерњем језику за текстуалну поруку чији \n"
 "облик зависи од броја.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
-"  -e                        укључује употребу неких нарочитих низова\n"
-"  -E                        (занемарено ради сагласности)\n"
-"  -h, --help                приказује ову помоћ и излази\n"
-"  -n                        одбацује пратећи знак за нови ред\n"
-"  -V, --version             приказује податке о издању и излази\n"
-"  [ДОМЕНТЕКСТА]             довлачи преведену поруку из ДОМЕНТЕКСТА\n"
-"  МСГИД МСГИД-МНОЖИНА       преводи облик једнине/множине\n"
-"  БРОЈ                      бира облик једнине/множине према овој вредности\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,3 +328,64 @@ msgstr ""
 "у обичном директоријуму, други директоријум се може навести помоћу \n"
 "променљиве окружења ДИРДОМЕНТЕКСТА.\n"
 "Уобичајени директоријум за тражење је: %s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: непрепознатљива опција „--%s“\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: опција „-W %s“ је нејасна\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: опција „-W %s“ захтева аргумент\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
+#~ "  -e                        укључује употребу неких нарочитих низова\n"
+#~ "  -E                        (занемарено ради сагласности)\n"
+#~ "  -h, --help                приказује ову помоћ и излази\n"
+#~ "  -n                        одбацује пратећи знак за нови ред\n"
+#~ "  -V, --version             приказује податке о издању и излази\n"
+#~ "  [ДОМЕНТЕКСТА] МСГИД       користи преведену поруку за МСГИД из \n"
+#~ "                            ДОМЕНТЕКСТА\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕНТЕКСТА  користи преведене поруке из ДОМЕНТЕКСТА\n"
+#~ "  -e                        укључује употребу неких нарочитих низова\n"
+#~ "  -E                        (занемарено ради сагласности)\n"
+#~ "  -h, --help                приказује ову помоћ и излази\n"
+#~ "  -n                        одбацује пратећи знак за нови ред\n"
+#~ "  -V, --version             приказује податке о издању и излази\n"
+#~ "  [ДОМЕНТЕКСТА]             довлачи преведену поруку из ДОМЕНТЕКСТА\n"
+#~ "  МСГИД МСГИД-МНОЖИНА       преводи облик једнине/множине\n"
+#~ "  БРОЈ                      бира облик једнине/множине према овој вредности\n"
diff --git a/gettext-runtime/po/sv.po b/gettext-runtime/po/sv.po
index e16019df6..d2112084a 100644
--- a/gettext-runtime/po/sv.po
+++ b/gettext-runtime/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-05-26 22:53+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -18,87 +18,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan ”%s” är tvetydig; alternativ:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: flaggan ”%s” är tvetydig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”--%s” tar inget argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan ”%s” är tvetydig; alternativ:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: okänd flagga ”%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: flaggan ”%c%s” tar inget argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: flaggan ”%s” kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga ”--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga ”%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- ”%c”\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan ”-W %s” är tvetydig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan ”-W %s” kräver ett argument\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -107,7 +92,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
@@ -117,57 +102,57 @@ msgstr "Skrivet av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argument saknas"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Försök med ”%s --help” för mer information.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Användning: %s [FLAGGA] [SKALFORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Ersätter värdena av miljövariabler.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Körläge:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             skriv ut variabler som förekommer i SKALFORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               visa versionsinformation och avsluta\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +168,7 @@ msgstr ""
 "miljövariabler som refereras i SKALFORMAT; annars ersätts alla miljövariabler\n"
 "som hittas i standard in.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -196,27 +181,28 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
-"Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
+"Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv."
+"se>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då ”%s” lästes"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standard in"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -225,33 +211,56 @@ msgstr ""
 "Användning: %s [FLAGGA] [[TEXTDOMÄN] MSGID]\n"
 "eller       %s [FLAGGA] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Visa lokala språkets översättning av textmeddelande.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEXTDOMÄN    hämta översatta meddelanden från TEXTDOMÄN\n"
-"  -e                        expandera några kontrollsekvenser\n"
-"  -E                        (ignorerad för bakåtkompatibilitet)\n"
-"  -h, --help                visa denna hjälptext och avsluta\n"
-"  -n                        skriv inte ut avslutande nyrad\n"
-"  -V, --version             visa versionsinformation och avsluta\n"
-"  [TEXTDOMÄN] MSGID         hämta översatt meddelande som motsvarar\n"
-"                            MSGID från TEXTDOMÄN\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               visa versionsinformation och avsluta\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -271,12 +280,12 @@ msgstr ""
 "översätts de argument som hittas i den valda meddelandekatalogen.\n"
 "Normal katalog för meddelandekataloger: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Användning: %s [FLAGGA] [TEXTDOMÄN] MSGID MSGID-PLURAL ANTAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,28 +294,31 @@ msgstr ""
 "Visa översättningar i det lokala språket av textmeddelanden vars grammatiska\n"
 "form beror på ett tal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMÄN    hämta översatta meddelanden från TEXTDOMÄN\n"
-"  -e                        expandera några kontrollsekvenser\n"
-"  -E                        (ignorerad för bakåtkompatibilitet)\n"
-"  -h, --help                visa denna hjälptext och avsluta\n"
-"  -V, --version             visa versionsinformation och avsluta\n"
-"  [TEXTDOMÄN]               hämta meddelande från TEXTDOMÄN\n"
-"  MSGID MSGID-PLURAL        översätt MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  ANTAL                     välj singular/plural baserat på detta värde\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -319,3 +331,63 @@ 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"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan ”--%s” tar inget argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: okänd flagga ”--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: flaggan ”-W %s” är tvetydig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan ”-W %s” tar inget argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: flaggan ”-W %s” kräver ett argument\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMÄN    hämta översatta meddelanden från TEXTDOMÄN\n"
+#~ "  -e                        expandera några kontrollsekvenser\n"
+#~ "  -E                        (ignorerad för bakåtkompatibilitet)\n"
+#~ "  -h, --help                visa denna hjälptext och avsluta\n"
+#~ "  -n                        skriv inte ut avslutande nyrad\n"
+#~ "  -V, --version             visa versionsinformation och avsluta\n"
+#~ "  [TEXTDOMÄN] MSGID         hämta översatt meddelande som motsvarar\n"
+#~ "                            MSGID från TEXTDOMÄN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMÄN    hämta översatta meddelanden från TEXTDOMÄN\n"
+#~ "  -e                        expandera några kontrollsekvenser\n"
+#~ "  -E                        (ignorerad för bakåtkompatibilitet)\n"
+#~ "  -h, --help                visa denna hjälptext och avsluta\n"
+#~ "  -V, --version             visa versionsinformation och avsluta\n"
+#~ "  [TEXTDOMÄN]               hämta meddelande från TEXTDOMÄN\n"
+#~ "  MSGID MSGID-PLURAL        översätt MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  ANTAL                     välj singular/plural baserat på detta värde\n"
diff --git a/gettext-runtime/po/tr.po b/gettext-runtime/po/tr.po
index 7ef6aea31..99c552e07 100644
--- a/gettext-runtime/po/tr.po
+++ b/gettext-runtime/po/tr.po
@@ -1,98 +1,88 @@
 # This file is distributed under the same license as the gettext package.
 # Turkish translations for Gnu Gettext Package.
 # Copyright (C) 2006 Free Software Foundation, Inc.
-#
 # Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2001, ..., 2006.
 # Volkan Gezer <volkangezer@gmail.com>, 2015.
+# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.19.4-rc1\n"
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-12-10 13:21+0900\n"
-"PO-Revision-Date: 2015-02-15 20:19+0100\n"
-"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-11-24 18:13+0400\n"
+"Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: '%s' seçeneği belirsiz\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: `%s' seçeneği belirsiz; kullanılabilecekler:"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: '--%s' seçeneği bağımsız değişkene izin vermiyor\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: '%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: '%c%s' seçeneği bağımsız değişkene izin vermiyor\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: '--%s' seçeneği bağımsız bir değişken gerektiriyor\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: '--%s' seçeneği bilinmiyor\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: '%c%s' seçeneği bilinmiyor\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek bir bağımsız değişken gerektiriyor -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: '-W %s' seçeneği belirsiz\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: '-W %s' seçeneği bağımsız bir değişkene izin vermiyor\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: '-W %s' seçeneği bağımsız bir değişken gerektiriyor\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -101,7 +91,7 @@ msgstr ""
 "Bu özgür yazılımdır: değiştirip dağıtma özgürlüğüne sahipsiniz.\n"
 "Yasaların elverdiği ölçüde HİÇBİR GARANTİ yoktur.\n"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
@@ -111,57 +101,57 @@ msgstr "%s tarafından yazıldı.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "argümanlar eksik"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için '%s --help' deneyin.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [KABUK-BİÇİMİ]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Ortam değişkenlerinin değerleri ikame edilir.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             KABUK-BİÇİMİ içindeki değişkenleri çıktılar\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirici çıktı:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, 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/envsubst.c:198
+#: src/envsubst.c:203
 #, 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"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -178,7 +168,7 @@ msgstr ""
 "Aksi takdirde, standart girdideki ortam değişkenlerinin tümüne bu ikame\n"
 "işlemi uygulanır.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -192,27 +182,27 @@ 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/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "standart girdi"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -221,32 +211,56 @@ msgstr ""
 "Kullanımı: %s [SEÇENEK] [[PAKET] MSGID]\n"
 "ya da:     %s [SEÇENEK] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Bir iletinin anadile çevirisini gösterir.\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=PAKET    ileti çevirisini PAKET.mo dosyasından alır.\n"
-"  -e                    önceleme dizilerinin kullanımını etkinleştirir\n"
-"  -E                    (uyumluluk için yoksayıldı)\n"
-"  -h, --help            bu yardım iletisini gösterir ve çıkar\n"
-"  -n                    izleyen satır sonu karakterini yoksayar\n"
-"  -V, --version         sürüm bilgilerini gösterir ve çıkar\n"
-"  [PAKET] MSGID         PAKET.mo dosyasından MSGID ile ilişkili çeviriyi alır\n"
-
-#: src/gettext.c:264
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -266,40 +280,43 @@ msgstr ""
 "bulunan mesajlar çevrilir.\n"
 "Standart arama dizini: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Kullanımı: %s [SEÇENEK] [PAKET] MSGID MSGID-PLURAL SAYI\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Bir sayıya bağlı olarak ilgili tekil/çoğul ileti çevirisini gösterir.\n"
 
-#: src/ngettext.c:222
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=PAKET   ileti çevirileri yazılım PAKETinden alınır.\n"
-"  -e                   öncelem dizilerinin kullanımı etkinleştirilir\n"
-"  -E                   (uyumluluk için yoksayıldı)\n"
-"  -h, --help           bu yardım iletisini gösterir ve çıkar\n"
-"  -V, --version        sürüm bilgilerini gösterir ve çıkar\n"
-"  [PAKET]              ileti çevirileri yazılım PAKETinden alınır.\n"
-"  MSGID MSGID-PLURAL   MSGID (tekil) / MSGID-PLURAL (çoğul) çevrilir\n"
-"  SAYI               SAYIya bağlı olarak tekil/çoğul iletilerden biri seçilir\n"
-
-#: src/ngettext.c:233
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -313,16 +330,78 @@ msgstr ""
 "TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n"
 "Standart arama dizini: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: '--%s' seçeneği bağımsız değişkene izin vermiyor\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: '--%s' seçeneği bilinmiyor\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: '-W %s' seçeneği belirsiz\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: '-W %s' seçeneği bağımsız bir değişkene izin vermiyor\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: '-W %s' seçeneği bağımsız bir değişken gerektiriyor\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=PAKET    ileti çevirisini PAKET.mo dosyasından alır.\n"
+#~ "  -e                    önceleme dizilerinin kullanımını etkinleştirir\n"
+#~ "  -E                    (uyumluluk için yoksayıldı)\n"
+#~ "  -h, --help            bu yardım iletisini gösterir ve çıkar\n"
+#~ "  -n                    izleyen satır sonu karakterini yoksayar\n"
+#~ "  -V, --version         sürüm bilgilerini gösterir ve çıkar\n"
+#~ "  [PAKET] MSGID         PAKET.mo dosyasından MSGID ile ilişkili çeviriyi alır\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=PAKET   ileti çevirileri yazılım PAKETinden alınır.\n"
+#~ "  -e                   öncelem dizilerinin kullanımı etkinleştirilir\n"
+#~ "  -E                   (uyumluluk için yoksayıldı)\n"
+#~ "  -h, --help           bu yardım iletisini gösterir ve çıkar\n"
+#~ "  -V, --version        sürüm bilgilerini gösterir ve çıkar\n"
+#~ "  [PAKET]              ileti çevirileri yazılım PAKETinden alınır.\n"
+#~ "  MSGID MSGID-PLURAL   MSGID (tekil) / MSGID-PLURAL (çoğul) çevrilir\n"
+#~ "  SAYI               SAYIya bağlı olarak tekil/çoğul iletilerden biri seçilir\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Telif Hakkı (C) %s Free Software Foundation, Inc.\n"
-#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n"
+#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna "
+#~ "bakınız.\n"
 #~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
 #~ "UYGUNLUĞU için bile garanti verilmez.\n"
 
@@ -354,7 +433,9 @@ msgstr ""
 #~ msgstr "%s alt süreci başarısız"
 
 #~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin"
+#~ msgstr ""
+#~ "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini "
+#~ "belirleyin"
 
 #~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 #~ msgstr ""
@@ -373,43 +454,69 @@ msgstr ""
 #~ msgid "number of format specifications in 'msgid' and '%s' does not match"
 #~ msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
-#~ msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr ""
+#~ "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
 
-#~ msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-#~ msgstr "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
+#~ msgid ""
+#~ "a format specification for argument %u, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
 
 #~ 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"
 
-#~ msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
-#~ msgstr "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
+#~ msgid ""
+#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#~ "'msgid'"
+#~ msgstr ""
+#~ "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde "
+#~ "yok"
 
 #~ 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"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-#~ msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil"
+#~ msgid ""
+#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
+#~ "same"
+#~ msgstr ""
+#~ "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil"
 
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
 #~ msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri aynı değil"
 
 #~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-#~ msgstr "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
+#~ msgstr ""
+#~ "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi "
+#~ "değil"
 
-#~ msgid "format specifications in 'msgid' 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"
+#~ msgid ""
+#~ "format specifications in 'msgid' 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"
 
-#~ msgid "format specifications in 'msgid' 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"
+#~ msgid ""
+#~ "format specifications in 'msgid' 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"
 
-#~ msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+#~ msgid ""
+#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
+#~ "'msgid'"
 #~ msgstr "'%2$s' içinde '%1$s' için 'msgid' içinde bir biçem belirteci yok"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 #~ msgstr "'%s' için '%s' içinde bir biçem belirteci yok"
 
-#~ msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#~ msgid ""
+#~ "format specifications in 'msgid' 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"
 
 #~ msgid "Usage: %s [OPTION]\n"
@@ -421,13 +528,15 @@ msgstr ""
 #~ msgid ""
 #~ "Output format:\n"
 #~ "  -s, --short           short host name\n"
-#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain name,\n"
+#~ "  -f, --fqdn, --long    long host name, includes fully qualified domain "
+#~ "name,\n"
 #~ "                          and aliases\n"
 #~ "  -i, --ip-address      addresses for the hostname\n"
 #~ msgstr ""
 #~ "Çıktı biçemi:\n"
 #~ "  -s, --short                 kısa makina ismi\n"
-#~ "  -f, --fqdn, --long          uzun makina ismi, alan ismini ve rümuzları da\n"
+#~ "  -f, --fqdn, --long          uzun makina ismi, alan ismini ve rümuzları "
+#~ "da\n"
 #~ "                              içerir\n"
 #~ "  -i, --ip-address            makinanın IP adresi\n"
 
@@ -444,30 +553,38 @@ msgstr ""
 #~ msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
 #~ msgid ""
-#~ "Filters the messages of a translation catalog according to their attributes,\n"
+#~ "Filters the messages of a translation catalog according to their "
+#~ "attributes,\n"
 #~ "and manipulates the attributes.\n"
 #~ msgstr ""
 #~ "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 #~ "ve özellikleri uygular.\n"
 
-#~ 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"
+#~ 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"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  GİRDİDOSYASI                PO girdi dosyası\n"
-#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi ekler\n"
-#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
+#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi "
+#~ "ekler\n"
+#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi "
+#~ "okunur.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE      write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Çıktı dosyası konumu:\n"
@@ -477,16 +594,20 @@ msgstr ""
 
 #~ msgid ""
 #~ "Message selection:\n"
-#~ "      --translated            keep translated, remove untranslated messages\n"
-#~ "      --untranslated          keep untranslated, remove translated messages\n"
+#~ "      --translated            keep translated, remove untranslated "
+#~ "messages\n"
+#~ "      --untranslated          keep untranslated, remove translated "
+#~ "messages\n"
 #~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 #~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 #~ "      --no-obsolete           remove obsolete #~ messages\n"
 #~ "      --only-obsolete         keep obsolete #~ messages\n"
 #~ msgstr ""
 #~ "İleti seçimi:\n"
-#~ "      --translated            çevrilenler tutulur, çevrilmeyenler silinir.\n"
-#~ "      --untranslated          çevrilmeyenler tutulur, çevrilenler silinir.\n"
+#~ "      --translated            çevrilenler tutulur, çevrilmeyenler "
+#~ "silinir.\n"
+#~ "      --untranslated          çevrilmeyenler tutulur, çevrilenler "
+#~ "silinir.\n"
 #~ "      --no-fuzzy              'fuzzy' imli iletiler silinir.\n"
 #~ "      --only-fuzzy            'fuzzy' imli iletiler tutulur.\n"
 #~ "      --no-obsolete           eski #~ iletileri silinir.\n"
@@ -499,15 +620,19 @@ msgstr ""
 #~ "      --set-obsolete          set all messages obsolete\n"
 #~ "      --clear-obsolete        set all messages non-obsolete\n"
 #~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-#~ "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-"
+#~ "obsolete\n"
 #~ msgstr ""
 #~ "Özellik uygulaması:\n"
 #~ "      --set-fuzzy             tüm iletilere 'fuzzy' uygular\n"
-#~ "      --clear-fuzzy           tüm fuzzy imlilerden 'fuzzy' imini kaldırır\n"
+#~ "      --clear-fuzzy           tüm fuzzy imlilerden 'fuzzy' imini "
+#~ "kaldırır\n"
 #~ "      --set-obsolete          tüm iletileri eski olarak imler\n"
-#~ "      --clear-obsolete        tüm eski imli iletilerden eski imini kaldırır\n"
+#~ "      --clear-obsolete        tüm eski imli iletilerden eski imini "
+#~ "kaldırır\n"
 #~ "      --fuzzy                 --only-fuzzy --clear-fuzzy için kısaltma\n"
-#~ "      --obsolete              --only-obsolete --clear-obsolete için kısaltma\n"
+#~ "      --obsolete              --only-obsolete --clear-obsolete için "
+#~ "kısaltma\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -516,16 +641,20 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                write the .po file using indented style\n"
 #~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -534,7 +663,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -552,18 +682,23 @@ msgstr ""
 #~ "before messages are printed.  Conversely, the --less-than option may be\n"
 #~ "used to specify less commonality before messages are printed (i.e.\n"
 #~ "--less-than=2 will only print the unique messages).  Translations,\n"
-#~ "comments and extract comments will be cumulated, except that if --use-first\n"
+#~ "comments and extract comments will be cumulated, except that if --use-"
+#~ "first\n"
 #~ "is specified, they will be taken from the first PO file to define them.\n"
 #~ "File positions from all PO files will be cumulated.\n"
 #~ msgstr ""
 #~ "Belirtilen PO dosyalarını birleştirir ve katıştırır.\n"
 #~ "Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri\n"
 #~ "bulur. --more-than seçeneği kullanılarak, iletiler yazılmadan önce,\n"
-#~ "dosyalarda ortak olan iletilerin belirtilen miktardan fazla olanları seçilir.\n"
-#~ "Tersine olarak --less-than seçeneği kullanılarak, iletiler yazılmadan önce,\n"
-#~ "dosyalarda ortak olan iletilerin belirtilen miktardan az olanları seçilir.\n"
+#~ "dosyalarda ortak olan iletilerin belirtilen miktardan fazla olanları "
+#~ "seçilir.\n"
+#~ "Tersine olarak --less-than seçeneği kullanılarak, iletiler yazılmadan "
+#~ "önce,\n"
+#~ "dosyalarda ortak olan iletilerin belirtilen miktardan az olanları "
+#~ "seçilir.\n"
 #~ "(Örneğin --less-than=2 ile tek başına-ortak olmayan iletiler basılır.)\n"
-#~ "--use-first seçeneği belirtilmediği takdirde, yorumlar ve çıkarma yorumları\n"
+#~ "--use-first seçeneği belirtilmediği takdirde, yorumlar ve çıkarma "
+#~ "yorumları\n"
 #~ "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 #~ "alınır.\n"
 
@@ -571,29 +706,34 @@ msgstr ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE ...                  input files\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  GİRDİDOSYASI ...            girdi dosyaları\n"
 #~ "  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
-#~ "  -D, --directory=DİZİN       girdi dosyalarının arama yoluna DİZİN eklenir\n"
+#~ "  -D, --directory=DİZİN       girdi dosyalarının arama yoluna DİZİN "
+#~ "eklenir\n"
 #~ "Girdi dosyası - ise standart girdi okunur.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE         write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Çıktı dosyası konumu:\n"
 #~ "  -o, --output-file=DOSYA     çıktı DOSYAya yazılır\n"
-#~ "Çıktı dosyası verilmezse ya da - verilirse sonuçlar standart çıktıya yazılır.\n"
+#~ "Çıktı dosyası verilmezse ya da - verilirse sonuçlar standart çıktıya "
+#~ "yazılır.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 0 if not set\n"
@@ -602,37 +742,51 @@ msgstr ""
 #~ msgstr ""
 #~ "İleti seçimi:\n"
 #~ "  -<, --less-than=SAYI        çok sayıda tanımlanmış iletiler arasında\n"
-#~ "                              SAYI dan az tanımlanmış iletileri gösterir,\n"
-#~ "                              belirtilmezse öntanımlı değer sonsuz kullanılır\n"
+#~ "                              SAYI dan az tanımlanmış iletileri "
+#~ "gösterir,\n"
+#~ "                              belirtilmezse öntanımlı değer sonsuz "
+#~ "kullanılır\n"
 #~ "  ->, --more-than=SAYI        çok sayıda tanımlanmış iletiler arasında\n"
-#~ "                              SAYI dan fazla tanımlanmış iletileri gösterir,\n"
+#~ "                              SAYI dan fazla tanımlanmış iletileri "
+#~ "gösterir,\n"
 #~ "                              belirtilmezse öntanımlı değer 1 kullanılır\n"
-#~ "  -u, --unique                --less-than=2 için kısaltma, sadece tek olan\n"
+#~ "  -u, --unique                --less-than=2 için kısaltma, sadece tek "
+#~ "olan\n"
 #~ "                              iletiler gösterilir\n"
 
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for each\n"
-#~ "                                 message, don't merge several translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
 #~ "  -t, --to-code=İSİM          çıktı için kodlama belirtilir\n"
-#~ "      --use-first             çok sayıda çeviri arasından sadece ilk çeviriyi\n"
+#~ "      --use-first             çok sayıda çeviri arasından sadece ilk "
+#~ "çeviriyi\n"
 #~ "                              kullanır\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -641,7 +795,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -667,32 +822,40 @@ msgstr ""
 #~ msgid ""
 #~ "Compare two Uniforum style .po files to check that both contain the same\n"
 #~ "set of msgid strings.  The def.po file is an existing PO file with the\n"
-#~ "translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+#~ "translations.  The ref.pot file is the last created PO file, or a PO "
+#~ "Template\n"
 #~ "file (generally created by xgettext).  This is useful for checking that\n"
-#~ "you have translated each and every message in your program.  Where an exact\n"
-#~ "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+#~ "you have translated each and every message in your program.  Where an "
+#~ "exact\n"
+#~ "match cannot be found, fuzzy matching is used to produce better "
+#~ "diagnostics.\n"
 #~ msgstr ""
 #~ "Aynı msgid dizgelerini içeren iki .po dosyasını karşılaştırır.\n"
 #~ "def.po dosyası eski çevirileri içeren mevcut PO dosyasıdır.\n"
 #~ "ref.pot dosyası ise yeni POT dosyasıdır. Bu, programınızdaki her iletiyi\n"
-#~ "ve çevirisini kontrol etmek için kullanışlıdır. Zorunlu eşleşme bulunamazsa,\n"
+#~ "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"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  def.po                      translations\n"
 #~ "  ref.pot                     references to the sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  def.po                      çevirilerin bulunduğu dosya\n"
-#~ "  ref.pot                     çeviri dosyasına eklenecek girdilerin bulunduğu\n"
+#~ "  ref.pot                     çeviri dosyasına eklenecek girdilerin "
+#~ "bulunduğu\n"
 #~ "                              dosya\n"
-#~ "  -D, --directory=DİZİN       girdi dosyaları arama yoluna eklenecek DİZİN\n"
+#~ "  -D, --directory=DİZİN       girdi dosyaları arama yoluna eklenecek "
+#~ "DİZİN\n"
 
 #~ msgid ""
 #~ "Operation modifiers:\n"
-#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
 #~ msgstr ""
 #~ "İşlem seçenekleri:\n"
 #~ "  -m, --multi-domain          ref.pot'u tüm def.po dosyalarına uygular\n"
@@ -735,18 +898,23 @@ msgstr ""
 #~ msgstr ""
 #~ "Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri\n"
 #~ "bulur. --more-than seçeneği kullanılarak, iletiler yazılmadan önce,\n"
-#~ "dosyalarda ortak olan iletilerin belirtilen miktardan fazla olanları seçilir.\n"
-#~ "Tersine olarak --less-than seçeneği kullanılarak, iletiler yazılmadan önce,\n"
-#~ "dosyalarda ortak olan iletilerin belirtilen miktardan az olanları seçilir.\n"
+#~ "dosyalarda ortak olan iletilerin belirtilen miktardan fazla olanları "
+#~ "seçilir.\n"
+#~ "Tersine olarak --less-than seçeneği kullanılarak, iletiler yazılmadan "
+#~ "önce,\n"
+#~ "dosyalarda ortak olan iletilerin belirtilen miktardan az olanları "
+#~ "seçilir.\n"
 #~ "(Örneğin --less-than=2 ile tek başına-ortak olmayan iletiler basılır.)\n"
 #~ "Sadece ilk PO dosyasında tanımlandığı şekliyle çeviriler, yorumlar ve \n"
-#~ "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
+#~ "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya "
+#~ "konumları\n"
 #~ "korunmuş olacaktır.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -755,32 +923,44 @@ msgstr ""
 #~ msgstr ""
 #~ "İleti seçimi:\n"
 #~ "  -<, --less-than=SAYI        çok sayıda tanımlanmış iletiler arasında\n"
-#~ "                              SAYI dan az tanımlanmış iletileri gösterir,\n"
-#~ "                              belirtilmezse öntanımlı değer sonsuz kullanılır\n"
+#~ "                              SAYI dan az tanımlanmış iletileri "
+#~ "gösterir,\n"
+#~ "                              belirtilmezse öntanımlı değer sonsuz "
+#~ "kullanılır\n"
 #~ "  ->, --more-than=SAYI        çok sayıda tanımlanmış iletiler arasında\n"
-#~ "                              SAYI dan fazla tanımlanmış iletileri gösterir,\n"
+#~ "                              SAYI dan fazla tanımlanmış iletileri "
+#~ "gösterir,\n"
 #~ "                              belirtilmezse öntanımlı değer 1 kullanılır\n"
-#~ "  -u, --unique                --less-than=2 için kısaltma, sadece tek olan\n"
+#~ "  -u, --unique                --less-than=2 için kısaltma, sadece tek "
+#~ "olan\n"
 #~ "                              iletiler gösterilir\n"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -789,7 +969,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -814,16 +995,19 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -832,7 +1016,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -852,7 +1037,8 @@ msgstr ""
 #~ "xgettext).  Untranslated entries are assigned a translation that is\n"
 #~ "identical to the msgid, and are marked fuzzy.\n"
 #~ msgstr ""
-#~ "Bir İngilizce çeviri kataloğu oluşturur. Girdi dosyası ya son oluşturulan\n"
+#~ "Bir İngilizce çeviri kataloğu oluşturur. Girdi dosyası ya son "
+#~ "oluşturulan\n"
 #~ "İngilizce PO dosyasıdır ya da genellikle xgettext tarafından oluşturulan\n"
 #~ "PO Şablon dosyasıdır. Çevirisiz girdilere msgid ile uyuşan bir çeviri\n"
 #~ "yerleştirilir ve fuzzy olarak imlenir.\n"
@@ -860,13 +1046,16 @@ msgstr ""
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO or POT file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  GİRDİDOSYASI                PO ya da POT girdi dosyası\n"
-#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi ekler\n"
-#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
+#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi "
+#~ "ekler\n"
+#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi "
+#~ "okunur.\n"
 
 #~ msgid "missing command name"
 #~ msgstr "komut ismi eksik"
@@ -888,22 +1077,28 @@ msgstr ""
 #~ "elde edilen en yüksek dönüş kodunu verir.\n"
 
 #~ 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"
+#~ "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 ""
 #~ "'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"
+#~ "çıktılar.  \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak "
+#~ "elverişlidir.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  -i, --input=INPUTFILE       input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  -i, --input=GİRDİDOSYASI    PO girdi dosyası\n"
-#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi ekler\n"
-#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
+#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi "
+#~ "ekler\n"
+#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi "
+#~ "okunur.\n"
 
 #~ msgid "write to stdout failed"
 #~ msgstr "standart çıktıya yazılamadı"
@@ -924,7 +1119,8 @@ msgstr ""
 #~ msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n"
 
 #~ msgid ""
-#~ "The FILTER can be any program that reads a translation from standard input\n"
+#~ "The FILTER can be any program that reads a translation from standard "
+#~ "input\n"
 #~ "and writes a modified translation to standard output.\n"
 #~ msgstr ""
 #~ "SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n"
@@ -933,9 +1129,11 @@ msgstr ""
 #~ msgid ""
 #~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 #~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+#~ "commands\n"
 #~ "                                to be executed\n"
-#~ "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern "
+#~ "space\n"
 #~ msgstr ""
 #~ "SÜZGEÇ olarak 'sed' kullanıldığında faydalı SÜZGEÇ-SEÇENEKLERİ:\n"
 #~ "  -e, --expression=BETİK      çalıştırılacak komutlara BETİĞi ekler\n"
@@ -949,18 +1147,22 @@ msgstr ""
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -970,7 +1172,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -1020,29 +1223,37 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] filename.po ...\n"
 #~ msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#~ msgid "Generate binary message catalog from textual translation description.\n"
+#~ msgid ""
+#~ "Generate binary message catalog from textual translation description.\n"
 #~ msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  filename.po ...             input files\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  dosyaismi.po ...            girdi dosyası\n"
-#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi ekler\n"
-#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
+#~ "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi "
+#~ "ekler\n"
+#~ "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi "
+#~ "okunur.\n"
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+#~ "higher)\n"
 #~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 #~ msgstr ""
 #~ "İşlem kipi:\n"
-#~ "  -j, --java              Java kipi: bir Java ÖzkaynakPaketi sınıfı üretir\n"
-#~ "      --java2             --java gibi, ama Java2 (JDK 1.2 ve üstü) kabul eder\n"
+#~ "  -j, --java              Java kipi: bir Java ÖzkaynakPaketi sınıfı "
+#~ "üretir\n"
+#~ "      --java2             --java gibi, ama Java2 (JDK 1.2 ve üstü) kabul "
+#~ "eder\n"
 #~ "      --tcl               Tcl kipi: bir tcl/msgcat .msg dosyası üretir\n"
 
 #~ msgid ""
@@ -1054,14 +1265,18 @@ msgstr ""
 #~ "Çıktı dosyası konumu:\n"
 #~ "  -o, --output-file=DOSYA     çıktı DOSYAya yazılır\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
-#~ "Çıktı dosyası verilmemişse ya da yerine - verilmişse standart çıktıya yazılır.\n"
+#~ "Çıktı dosyası verilmemişse ya da yerine - verilmişse standart çıktıya "
+#~ "yazılır.\n"
 
 #~ msgid ""
 #~ "Output file location in Java mode:\n"
 #~ "  -r, --resource=RESOURCE     resource name\n"
-#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-#~ "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-#~ "The class name is determined by appending the locale name to the resource name,\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of classes directory "
+#~ "hierarchy\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
 #~ "separated with an underscore.  The -d option is mandatory.  The class is\n"
 #~ "written under the specified directory.\n"
 #~ msgstr ""
@@ -1074,7 +1289,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
 #~ "specified directory.\n"
@@ -1087,25 +1303,34 @@ msgstr ""
 #~ msgid ""
 #~ "Input file interpretation:\n"
 #~ "  -c, --check                 perform all the checks implied by\n"
-#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          check language dependent format strings\n"
-#~ "      --check-header          verify presence and contents of the header entry\n"
-#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "      --check-header          verify presence and contents of the header "
+#~ "entry\n"
+#~ "      --check-domain          check for conflicts between domain "
+#~ "directives\n"
 #~ "                                and the --output-file option\n"
-#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
+#~ "accelerators for\n"
 #~ "                                menu items\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ msgstr ""
 #~ "Girdi dosyası yorumlama:\n"
 #~ "  -c, --check                 tüm denetimleri uygular:\n"
-#~ "                              --check-format, --check-header, --check-domain\n"
+#~ "                              --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          dile bağımlı biçem dizgelerini denetler\n"
-#~ "      --check-header          başlık girdilerinin içeriğini ve uygunluğunu\n"
+#~ "      --check-header          başlık girdilerinin içeriğini ve "
+#~ "uygunluğunu\n"
 #~ "                              denetler\n"
-#~ "      --check-domain          paket yönergeleri ile --output-file seçeneği\n"
+#~ "      --check-domain          paket yönergeleri ile --output-file "
+#~ "seçeneği\n"
 #~ "                              arasındaki çelişkileri denetler\n"
-#~ "  -C, --check-compatibility   GNU msgfmt'ın X/Open msgfmt gibi davranmasını\n"
+#~ "  -C, --check-compatibility   GNU msgfmt'ın X/Open msgfmt gibi "
+#~ "davranmasını\n"
 #~ "                              denetler\n"
 #~ "      --check-accelerators[=HARF]  menu öğelerindeki tuş kısayollarını\n"
 #~ "                                   denetler\n"
@@ -1113,11 +1338,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-#~ "      --no-hash               binary file will not include the hash table\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 ""
@@ -1136,7 +1364,8 @@ msgstr ""
 #~ msgid "plural expression can produce negative values"
 #~ msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#~ msgid "nplurals = %lu but plural expression can produce values as large as %lu"
+#~ 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"
 
 #~ msgid "plural expression can produce division by zero"
@@ -1145,8 +1374,12 @@ msgstr ""
 #~ msgid "plural expression can produce integer overflow"
 #~ msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#~ 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"
+#~ 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"
 
 #~ msgid "message catalog has plural form translations..."
 #~ msgstr "ileti kataloğu çoğul çeviriler içeriyor"
@@ -1179,25 +1412,31 @@ msgstr ""
 #~ msgid "Try using the following, valid for %s:\n"
 #~ msgstr "Aşağıdakiler %s için geçerli mi bakılacak:\n"
 
-#~ msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#~ msgid ""
+#~ "message catalog has plural form translations, but lacks a header entry "
+#~ "with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 #~ 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."
 
 #~ 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"
+#~ msgstr ""
+#~ "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
 #~ 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"
+#~ msgstr ""
+#~ "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
 #~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 #~ msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-#~ msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
+#~ msgstr ""
+#~ "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-#~ msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
+#~ msgstr ""
+#~ "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 #~ msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
@@ -1230,7 +1469,8 @@ msgstr ""
 #~ msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
 
 #~ msgid "warning: charset conversion will not work\n"
-#~ msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
+#~ msgstr ""
+#~ "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
 #~ msgid "warning: PO file header fuzzy\n"
 #~ msgstr "uyarı: PO dosya başlığı fuzzy\n"
@@ -1260,7 +1500,8 @@ msgstr ""
 #~ msgstr "'%c' seçeneği 'K' ya da 'T' belirtilmeden önce kullanılamaz"
 
 #~ msgid ""
-#~ "Extracts all messages of a translation catalog that match a given pattern\n"
+#~ "Extracts all messages of a translation catalog that match a given "
+#~ "pattern\n"
 #~ "or belong to some given source files.\n"
 #~ msgstr ""
 #~ "Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n"
@@ -1270,9 +1511,11 @@ msgstr ""
 #~ "Message selection:\n"
 #~ "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
 #~ "  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
-#~ "A message is selected if it comes from one of the specified source files,\n"
+#~ "A message is selected if it comes from one of the specified source "
+#~ "files,\n"
 #~ "or if it comes from one of the specified domains,\n"
-#~ "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
+#~ "or if -K is given and its key (msgid or msgid_plural) matches MSGID-"
+#~ "PATTERN,\n"
 #~ "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
 #~ "or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
 #~ "\n"
@@ -1285,11 +1528,13 @@ msgstr ""
 #~ "expressions if -E is given, or fixed strings if -F is given.\n"
 #~ "\n"
 #~ "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
-#~ "  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+#~ "  -M, --domain=DOMAINNAME     select messages belonging to domain "
+#~ "DOMAINNAME\n"
 #~ "  -K, --msgid                 start of patterns for the msgid\n"
 #~ "  -T, --msgstr                start of patterns for the msgstr\n"
 #~ "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
-#~ "  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
+#~ "  -F, --fixed-strings         PATTERN is a set of newline-separated "
+#~ "strings\n"
 #~ "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
 #~ "  -f, --file=FILE             obtain PATTERN from FILE\n"
 #~ "  -i, --ignore-case           ignore case distinctions\n"
@@ -1297,10 +1542,12 @@ msgstr ""
 #~ "İleti seçimi:\n"
 #~ "  [-N KAYNAKDOSYA]... [-M PAKETİSMİ]...\n"
 #~ "  [-K MSGID-KALIBI] [-T MSGSTR-KALIBI] [-C AÇIKLAMA-KALIBI]\n"
-#~ "İletiler, -N ile belirtilen kaynak dosyalarının birinden, -M ile belirtilen\n"
+#~ "İletiler, -N ile belirtilen kaynak dosyalarının birinden, -M ile "
+#~ "belirtilen\n"
 #~ "bir paketten, -K ile belirtilen MSGID-KALIBI ile eşleşen msgid veya\n"
 #~ "msgid_plural iletilerinden, -T ile belirtilen MSGSTR-KALIBI ile eşleşen\n"
-#~ "msgstr çevirilerine göre ya da -C ile belirtilen AÇIKLAMA-KALIBI ile eşleşen\n"
+#~ "msgstr çevirilerine göre ya da -C ile belirtilen AÇIKLAMA-KALIBI ile "
+#~ "eşleşen\n"
 #~ "çevirmenin açıklamalarına göre seçilebilir.\n"
 #~ "\n"
 #~ "Birden fazla seçim kriteri belirtilmişse seçilen ileti kümesi, her\n"
@@ -1311,7 +1558,8 @@ msgstr ""
 #~ "KALIPlar öntanımlı olarak düzenli ifadelerdir. -E ile belirtilmişlerse\n"
 #~ "gelişmiş düzenli ifadeler, -F ile belirtilmişlerse sabit dizgelerdir.\n"
 #~ "\n"
-#~ "  -N, --location=DOSYA        kaynakDOSYAsından çıkartılan dosyalar seçilir\n"
+#~ "  -N, --location=DOSYA        kaynakDOSYAsından çıkartılan dosyalar "
+#~ "seçilir\n"
 #~ "  -M, --domain=PAKET          PAKETe ait iletiler seçilir\n"
 #~ "  -K, --msgid                 msgid için kalıpların başlangıcı\n"
 #~ "  -T, --msgstr                msgstr için kalıpların başlangıcı\n"
@@ -1328,16 +1576,19 @@ msgstr ""
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -1346,7 +1597,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -1376,14 +1628,18 @@ msgstr ""
 #~ msgstr "%s oluşturuldu.\n"
 
 #~ msgid ""
-#~ "Creates a new PO file, initializing the meta information with values from the\n"
+#~ "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"
+#~ msgstr ""
+#~ "Kullanıcının ortam değişkenlerindeki bilgilerle bir yeni PO dosyası "
+#~ "oluşturur.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  -i, --input=INPUTFILE       input POT file\n"
-#~ "If no input file is given, the current directory is searched for the POT file.\n"
+#~ "If no input file is given, the current directory is searched for the POT "
+#~ "file.\n"
 #~ "If it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
@@ -1394,7 +1650,8 @@ msgstr ""
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE      write output to specified PO file\n"
-#~ "If no output file is given, it depends on the --locale option or the user's\n"
+#~ "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 ""
 #~ "Çıktı dosyası konumu:\n"
@@ -1405,16 +1662,20 @@ msgstr ""
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -l, --locale=LL_CC          set target locale\n"
-#~ "      --no-translator         assume the PO file is automatically generated\n"
+#~ "      --no-translator         assume the PO file is automatically "
+#~ "generated\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
 #~ "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
-#~ "      --no-translator         PO dosyasının otomatik üretildiği varsayılır\n"
+#~ "      --no-translator         PO dosyasının otomatik üretildiği "
+#~ "varsayılır\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 
 #~ msgid ""
@@ -1422,7 +1683,8 @@ msgstr ""
 #~ "Please specify the input .pot file through the --input option.\n"
 #~ msgstr ""
 #~ "Birden fazla .pot dosyası bulundu.\n"
-#~ "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile belirtin.\n"
+#~ "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
+#~ "belirtin.\n"
 
 #~ msgid "error reading current directory"
 #~ msgstr "dizin okunurken hata"
@@ -1432,7 +1694,8 @@ msgstr ""
 #~ "Please specify the input .pot file through the --input option.\n"
 #~ msgstr ""
 #~ "Bulunduğunuz dizinde .pot dosyası yok.\n"
-#~ "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile belirtin.\n"
+#~ "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
+#~ "belirtin.\n"
 
 #~ msgid "fdopen() failed"
 #~ msgstr "fdopen() başarısız"
@@ -1444,8 +1707,10 @@ msgstr ""
 #~ msgstr "%s alt süreci çıkış kodu %d ile başarısız"
 
 #~ msgid ""
-#~ "The new message catalog should contain your email address, so that users can\n"
-#~ "give you feedback about the translations, and so that maintainers can contact\n"
+#~ "The new message catalog should contain your email address, so that users "
+#~ "can\n"
+#~ "give you feedback about the translations, and so that maintainers can "
+#~ "contact\n"
 #~ "you in case of unexpected technical problems.\n"
 #~ msgstr ""
 #~ "Kullanıcıların çevirileriniz hakkında geribesleme sağlayabilmesi ve\n"
@@ -1461,12 +1726,17 @@ msgstr ""
 #~ msgid "two different charsets \"%s\" and \"%s\" in input file"
 #~ msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
 
-#~ msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#~ 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ş."
 
-#~ msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
+#~ msgid ""
+#~ "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+#~ "charset specification"
 #~ msgstr ""
-#~ "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
+#~ "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir "
+#~ "karakter\n"
 #~ "kümesi belirtilmemiş"
 
 #~ msgid "target charset \"%s\" is not a portable encoding name."
@@ -1483,7 +1753,8 @@ msgstr ""
 #~ "Çıktı UTF-8'e dönüştürülüyor.\n"
 
 #~ msgid ""
-#~ "Input files contain messages in different encodings, %s and %s among others.\n"
+#~ "Input files contain messages in different encodings, %s and %s among "
+#~ "others.\n"
 #~ "Converting the output to UTF-8.\n"
 #~ "To select a different output encoding, use the --to-code option.\n"
 #~ msgstr ""
@@ -1503,7 +1774,8 @@ msgstr ""
 #~ "Yapılabilecekler:\n"
 
 #~ 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"
+#~ msgstr ""
+#~ "- LC_ALL değişkenini %s kodlamasını kullanan bir yerele ayarlayın.\n"
 
 #~ msgid ""
 #~ "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -1537,15 +1809,20 @@ msgstr ""
 #~ msgid "conversion failure"
 #~ msgstr "dönüşüm başarısız"
 
-#~ msgid "input file doesn't contain a header entry with a charset specification"
+#~ 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ş"
 
-#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
+#~ "does not support this conversion."
 #~ msgstr ""
 #~ "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
 #~ "ve iconv() bu dönüşümü desteklemiyor."
 
-#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+#~ msgid ""
+#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
+#~ "was built without iconv()."
 #~ msgstr ""
 #~ "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n"
 #~ "Bu sürüm iconv() olmaksızın kurgulanmış."
@@ -1557,7 +1834,8 @@ msgstr ""
 #~ "Merges two Uniforum style .po files together.  The def.po file is an\n"
 #~ "existing PO file with translations which will be taken over to the newly\n"
 #~ "created file as long as they still match; comments will be preserved,\n"
-#~ "but extracted comments and file positions will be discarded.  The ref.pot\n"
+#~ "but extracted comments and file positions will be discarded.  The ref."
+#~ "pot\n"
 #~ "file is the last created PO file with up-to-date source references but\n"
 #~ "old translations, or a PO Template file (generally created by xgettext);\n"
 #~ "any translations or comments in the file will be discarded, however dot\n"
@@ -1568,7 +1846,8 @@ msgstr ""
 #~ "çevirilerin bulunduğu ve hala birçok bakımdan onunla eşleşen (yorumlar\n"
 #~ "korunmuş, fakat çıkarma yorumları ve dosya konumları iptal edilmiş olan)\n"
 #~ "yeni oluşturulmuş bir dosyaya çevirileri aktarılacak mevcut bir PO\n"
-#~ "dosyasıdır. ref.pot dosyası ise tüm çevirileri ve yorumları iptal edilmiş\n"
+#~ "dosyasıdır. ref.pot dosyası ise tüm çevirileri ve yorumları iptal "
+#~ "edilmiş\n"
 #~ "ama nokta yorumları ve dosya konumları korunmuş olan son\n"
 #~ "(genellikle xgettext tarafından) oluşturulan POT dosyasıdır.\n"
 #~ "Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n"
@@ -1578,15 +1857,19 @@ msgstr ""
 #~ "Input file location:\n"
 #~ "  def.po                      translations referring to old sources\n"
 #~ "  ref.pot                     references to new sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
 #~ "                              may be specified more than once\n"
 #~ msgstr ""
 #~ "Girdi dosyası konumu:\n"
 #~ "  def.po                      eski çevirilerin dosyası\n"
 #~ "  ref.pot                     yeni iletileri de içeren dosya\n"
-#~ "  -D, --directory=DİZİN       girdi dosyalarının arama yoluna eklenecek DİZİN\n"
-#~ "  -C, --compendium=DOSYA      ileti çevirilerinin birden fazlasını içerebilen\n"
+#~ "  -D, --directory=DİZİN       girdi dosyalarının arama yoluna eklenecek "
+#~ "DİZİN\n"
+#~ "  -C, --compendium=DOSYA      ileti çevirilerinin birden fazlasını "
+#~ "içerebilen\n"
 #~ "                              ek veritabanı\n"
 
 #~ msgid ""
@@ -1603,13 +1886,15 @@ msgstr ""
 #~ "The result is written back to def.po.\n"
 #~ "      --backup=CONTROL        make a backup of def.po\n"
 #~ "      --suffix=SUFFIX         override the usual backup suffix\n"
-#~ "The version control method may be selected via the --backup option or through\n"
+#~ "The version control method may be selected via the --backup option or "
+#~ "through\n"
 #~ "the VERSION_CONTROL environment variable.  Here are the values:\n"
 #~ "  none, off       never make backups (even if --backup is given)\n"
 #~ "  numbered, t     make numbered backups\n"
 #~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 #~ "  simple, never   always make simple backups\n"
-#~ "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+#~ "The backup suffix is `~', unless set with --suffix or the "
+#~ "SIMPLE_BACKUP_SUFFIX\n"
 #~ "environment variable.\n"
 #~ msgstr ""
 #~ "Güncelleme kipinde çıktı dosyası konumu:\n"
@@ -1620,7 +1905,8 @@ msgstr ""
 #~ "değişkeni ile belirtilebilir. Bu değerler:\n"
 #~ "  none, off                   yedekleme yapılmaz (--backup verilse bile)\n"
 #~ "  numbered, t                 numaralı yedekleme yapılır\n"
-#~ "  existing, nil               numaralı yedekler varsa numaralı yoksa basit\n"
+#~ "  existing, nil               numaralı yedekler varsa numaralı yoksa "
+#~ "basit\n"
 #~ "                              yedekleme yapılır\n"
 #~ "  simple, never               daima basit yedekleme yapılır\n"
 #~ "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n"
@@ -1645,8 +1931,12 @@ msgstr ""
 #~ msgid "this message should not define plural forms"
 #~ msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#~ msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-#~ msgstr "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık kullanılmayan ileti okundu.\n"
+#~ msgid ""
+#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+#~ "obsolete %ld.\n"
+#~ msgstr ""
+#~ "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
+#~ "kullanılmayan ileti okundu.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " bitti.\n"
@@ -1659,12 +1949,15 @@ msgstr ""
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java               Java mode: input is a Java ResourceBundle class\n"
+#~ "  -j, --java               Java mode: input is a Java ResourceBundle "
+#~ "class\n"
 #~ "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
 #~ msgstr ""
 #~ "İşlem kipi:\n"
-#~ "  -j, --java              Java kipi: girdi bir  Java ÖzkaynakPaketi sınıfıdır\n"
-#~ "      --tcl               Tcl kipi:, girdi bir tcl/iletiKat .msg dosyasıdır\n"
+#~ "  -j, --java              Java kipi: girdi bir  Java ÖzkaynakPaketi "
+#~ "sınıfıdır\n"
+#~ "      --tcl               Tcl kipi:, girdi bir tcl/iletiKat .msg "
+#~ "dosyasıdır\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
@@ -1678,8 +1971,10 @@ msgstr ""
 #~ msgid ""
 #~ "Input file location in Java mode:\n"
 #~ "  -r, --resource=RESOURCE  resource name\n"
-#~ "  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-#~ "The class name is determined by appending the locale name to the resource name,\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
+#~ "The class name is determined by appending the locale name to the resource "
+#~ "name,\n"
 #~ "separated with an underscore.  The class is located using the CLASSPATH.\n"
 #~ msgstr ""
 #~ "Java kipinde çıktı dosyası konumu:\n"
@@ -1690,20 +1985,23 @@ msgstr ""
 
 #~ msgid ""
 #~ "Input file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY             base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is located in the\n"
 #~ "specified directory.\n"
 #~ msgstr ""
 #~ "Tcl kipinde çıktı dosyası konumu:\n"
 #~ "  -l, --locale=YEREL          yerel ismi, dil ya da dil_ÜLKE\n"
-#~ "  -d DİZİN                    .msg ileti kataloglarının bulunduğu ana dizin\n"
+#~ "  -d DİZİN                    .msg ileti kataloglarının bulunduğu ana "
+#~ "dizin\n"
 #~ ".msg dosyası DİZİNde bulunduğundan -d  ve -l seçenekleri zorunludur.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE   write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Çıktı dosyası konumu:\n"
@@ -1723,13 +2021,15 @@ msgstr ""
 #~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 
@@ -1746,27 +2046,36 @@ msgstr ""
 
 #~ msgid ""
 #~ "Unifies duplicate translations in a translation catalog.\n"
-#~ "Finds duplicate translations of the same message ID.  Such duplicates are\n"
+#~ "Finds duplicate translations of the same message ID.  Such duplicates "
+#~ "are\n"
 #~ "invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
-#~ "default, duplicates are merged together.  When using the --repeated option,\n"
-#~ "only duplicates are output, and all other messages are discarded.  Comments\n"
+#~ "default, duplicates are merged together.  When using the --repeated "
+#~ "option,\n"
+#~ "only duplicates are output, and all other messages are discarded.  "
+#~ "Comments\n"
 #~ "and extracted comments will be cumulated, except that if --use-first is\n"
-#~ "specified, they will be taken from the first translation.  File positions\n"
-#~ "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
+#~ "specified, they will be taken from the first translation.  File "
+#~ "positions\n"
+#~ "will be cumulated.  When using the --unique option, duplicates are "
+#~ "discarded.\n"
 #~ msgstr ""
 #~ "Bir çeviri kataloğundaki tekrarlanmış çevirileri teke indirir.\n"
-#~ "Aynı ileti kimlikli tekrarlanmış çeviriler bulunur. Bunlar msgfmt, msgmerge\n"
+#~ "Aynı ileti kimlikli tekrarlanmış çeviriler bulunur. Bunlar msgfmt, "
+#~ "msgmerge\n"
 #~ "ve msgcat gibi uygulamalar için geçersiz girdilerdir. Öntanımlı olarak,\n"
-#~ "tekrarlananlar bir araya getirilir. --repeated seçeneği kullanılırsa, sadece\n"
+#~ "tekrarlananlar bir araya getirilir. --repeated seçeneği kullanılırsa, "
+#~ "sadece\n"
 #~ "tekrarlananlar çıktıya yazılır, diğer iletiler iptal edilir. --use first\n"
-#~ "seçeneği belirtilmedikçe yorumlar ve çıkarma yorumları tutulur. Belirtilirse,\n"
+#~ "seçeneği belirtilmedikçe yorumlar ve çıkarma yorumları tutulur. "
+#~ "Belirtilirse,\n"
 #~ "onlar ilk çeviriden alınır. Dosya konumları korunur. --unique seçeneği\n"
 #~ "kullanıldığında tekrarlananlar iptal edilir.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -d, --repeated                 print only duplicates\n"
-#~ "  -u, --unique                   print only unique messages, discard duplicates\n"
+#~ "  -u, --unique                   print only unique messages, discard "
+#~ "duplicates\n"
 #~ msgstr ""
 #~ "İleti seçimi:\n"
 #~ "  -d, --repeated              sadece tekrarlananlar gösterilir\n"
@@ -1878,7 +2187,8 @@ msgstr ""
 #~ msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
 #~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
-#~ msgstr "\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor"
+#~ msgstr ""
+#~ "\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor"
 
 #~ msgid "expected two arguments"
 #~ msgstr "iki argüman gerekiyor"
@@ -1887,7 +2197,8 @@ msgstr ""
 #~ msgstr "Kullanımı: %s [SEÇENEK] URL DOSYA\n"
 
 #~ msgid ""
-#~ "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
+#~ "Fetches and outputs the contents of an URL.  If the URL cannot be "
+#~ "accessed,\n"
 #~ "the locally accessible FILE is used instead.\n"
 #~ msgstr ""
 #~ "Bir URL'nin içeriğini alır ve çıktılar.  URL erişilebilir değilse,\n"
@@ -1897,7 +2208,8 @@ msgstr ""
 #~ msgstr "standart çıktıya yazılırken hata"
 
 #~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin"
+#~ msgstr ""
+#~ "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin"
 
 #~ msgid "cannot create a temporary directory using template \"%s\""
 #~ msgstr "\"%s\" şablonu kullanılarak bir geçici dizin oluşturulamaz"
@@ -1919,7 +2231,8 @@ msgstr ""
 #~ msgid "error while opening \"%s\" for writing"
 #~ msgstr "\"%s\" yazılmak için açılırken hata"
 
-#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
 #~ msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
 #~ msgid ""
@@ -1978,9 +2291,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output file location:\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
 #~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
 #~ "Çıktı dosyası konumu:\n"
@@ -1993,16 +2308,20 @@ msgstr ""
 #~ msgid ""
 #~ "Choice of input file language:\n"
 #~ "  -L, --language=NAME            recognise the specified language\n"
-#~ "                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
-#~ "                                   EmacsLisp, librep, Java, awk, YCP, Tcl,\n"
+#~ "                                   (C, C++, ObjectiveC, PO, Python, "
+#~ "Lisp,\n"
+#~ "                                   EmacsLisp, librep, Java, awk, YCP, "
+#~ "Tcl,\n"
 #~ "                                   RST, Glade)\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "By default the language is guessed depending on the input file name extension.\n"
+#~ "By default the language is guessed depending on the input file name "
+#~ "extension.\n"
 #~ msgstr ""
 #~ "Girdi dosyası dilinin seçimi:\n"
 #~ "  -L, --language=İSİM         belirtilen dil tanınır:\n"
 #~ "                              C, C++, ObjectiveC, PO, Python, Lisp, RST,\n"
-#~ "                              EmacsLisp, librep, Java, awk, YCP, Tcl, Glade\n"
+#~ "                              EmacsLisp, librep, Java, awk, YCP, Tcl, "
+#~ "Glade\n"
 #~ "  -C, --c++                   --language=C++ için kısaltma\n"
 #~ "Dil öntanımlı olarak girdi dosyasının uzantısına göre seçilir.\n"
 
@@ -2016,15 +2335,18 @@ msgstr ""
 #~ "İşlem kipi:\n"
 #~ "  -j, --join-existing         iletileri mevcut dosyaya bağlar\n"
 #~ "  -x, --exclude-file=DOSYA.po DOSYA.po dosyasındaki iletiler çıkartılmaz\n"
-#~ "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
+#~ "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına "
+#~ "yazar\n"
 
 #~ msgid ""
 #~ "Language=C/C++ specific options:\n"
 #~ "  -a, --extract-all              extract all strings\n"
-#~ "  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "      --debug                    more detailed formatstring recognition result\n"
+#~ "      --debug                    more detailed formatstring recognition "
+#~ "result\n"
 #~ msgstr ""
 #~ "Language=C/C++ ile belirtilebilecek seçenekler:\n"
 #~ "  -a, --extract-all           tüm dizgeleri çıkartır\n"
@@ -2032,31 +2354,43 @@ msgstr ""
 #~ "                              verilmediğinde kullanılacak öntanımlı bir\n"
 #~ "                              sözcük yoktur.)\n"
 #~ "  -T, --trigraphs             girdideki ANSI C trigrafları anlar\n"
-#~ "      --debug                 biçem dizgesi tanıması ile ilgili daha fazla\n"
+#~ "      --debug                 biçem dizgesi tanıması ile ilgili daha "
+#~ "fazla\n"
 #~ "                              ayrıntı verilir.\n"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz (öntanımlı)\n"
+#~ "  -e, --no-escape             C öncelemleri çıktıda kullanılmaz "
+#~ "(öntanımlı)\n"
 #~ "  -E, --escape                C öncelemleri çıktıda kullanılır\n"
 #~ "      --force-po              boş olsa bile PO dosyasını yazar\n"
 #~ "  -i, --indent                satırbaşı girintili çıktı biçemi\n"
@@ -2065,7 +2399,8 @@ msgstr ""
 #~ "                              (öntanımlı)\n"
 #~ "      --strict                Uniforum kipini etkinleştirir\n"
 #~ "  -w, --width=SAYI            sayfa genişliği SAYIya ayarlanır\n"
-#~ "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
+#~ "      --no-wrap               sayfa genişliğine sığmayan satırların "
+#~ "taşan\n"
 #~ "                              kısmı bir alt satıra indirilmez\n"
 #~ "  -s, --sort-output           çıktıyı sıralı üretir\n"
 #~ "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
@@ -2073,9 +2408,11 @@ msgstr ""
 #~ "      --copyright-holder=DİZGE  Çıktıya telif hakkı DİZGEsi yazılır\n"
 #~ "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 #~ "                              çıktıda bulunmaz\n"
-#~ "  -m, --msgstr-prefix[=DİZGE] msgstr girdileri için önek olarak DİZGE ya da\n"
+#~ "  -m, --msgstr-prefix[=DİZGE] msgstr girdileri için önek olarak DİZGE ya "
+#~ "da\n"
 #~ "                              \"\" kullanılır\n"
-#~ "  -M, --msgstr-suffix[=DİZGE] msgstr girdileri için sonek olarak DİZGE ya da\n"
+#~ "  -M, --msgstr-suffix[=DİZGE] msgstr girdileri için sonek olarak DİZGE ya "
+#~ "da\n"
 #~ "                              \"\" kullanılır\n"
 
 #~ msgid ""
@@ -2091,7 +2428,8 @@ msgstr ""
 #~ msgstr "dil `%s' bilinmiyor"
 
 #~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir sysdep parçası içeriyor"
+#~ msgstr ""
+#~ "\"%s\" dosyası NUL sonlandırmalı olmayan bir sysdep parçası içeriyor"
 
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "\"%s\" erişimi %ld göreli konumundan başarısız oldu"
diff --git a/gettext-runtime/po/uk.po b/gettext-runtime/po/uk.po
index 44c48106b..98b964a56 100644
--- a/gettext-runtime/po/uk.po
+++ b/gettext-runtime/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-23 20:47+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -23,81 +24,65 @@ msgstr ""
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: параметр «%s» не є однозначним\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: невідомий параметр «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: додавання аргументів до параметра «%c%s» не передбачено\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: до параметра «--%s» слід додати аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: невідомий параметр «--%s»\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: невідомий параметр «%c%s»\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: некоректний параметр — «%c»\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: до параметра слід додати аргумент — «%c»\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: параметр «-W %s» не є однозначним\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -106,7 +91,7 @@ msgstr ""
 "Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
 "Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор програми - %s.\n"
@@ -116,57 +101,57 @@ msgstr "Автор програми - %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "відсутні аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Використання: %s [ПАРАМЕТР] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Замінює значення змінних середовища.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Режим роботи:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             виводити змінні, що зустрічаються у SHELL-FORMAT\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  вивести довідку та завершити роботу\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -183,7 +168,7 @@ msgstr ""
 "випадку будуть замінюватись усі змінні середовища, що зустрічаються у\n"
 "стандартному вводі.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -196,25 +181,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "помилка при читанні \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "стандартний ввід"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -223,33 +208,56 @@ msgstr ""
 "Використання: %s [ПАРАМЕТР] [[ДОМЕН_ТЕКСТУ] MSGID]\n"
 "або:          %s [ПАРАМЕТР] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Відображає переклад текстового повідомлення.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=ДОМЕН_ТЕКСТУ використовувати перекладені повідомлення з\n"
-"                            домену ДОМЕН_ТЕКСТУ\n"
-"  -e                        дозволити використання деяких escape-послідовностей\n"
-"  -E                        (ігнорується, використовується для сумісності)\n"
-"  -h, --help                показати цю довідку та вийти\n"
-"  -n                        не виводити наприкінці символ переведення рядка\n"
-"  -V, --version             відобразити інформацію про версію та вийти\n"
-"  [ДОМЕН_ТЕКСТУ] MSGID      знайти переклад повідомлення MSGID у ДОМЕН_ТЕКСТУ\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  вивести довідку та завершити роботу\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -270,12 +278,12 @@ msgstr ""
 "виводяться їх переклади з вказаного домену.\n"
 "Стандартний каталог пошуку: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ДОМЕН_ТЕКСТУ] MSGID MSGID-PLURAL ЧИСЛО\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,29 +292,31 @@ msgstr ""
 "Відображає переклад текстового повідомлення, граматична форма якого залежить\n"
 "від числа.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=ДОМЕН_ТЕКСТУ використовувати перекладені повідомлення з\n"
-"                            вказаного домену ДОМЕН_ТЕКСТУ\n"
-"  -e                        дозволити використання деяких escape-послідовностей\n"
-"  -E                        (ігнорується, використовується для сумісності)\n"
-"  -h, --help                показати цю довідку та вийти\n"
-"  -V, --version             відобразити інформацію про версію та вийти\n"
-"  [ДОМЕН_ТЕКСТУ]            знайти переклад у вказаному домені ДОМЕН_ТЕКСТУ\n"
-"  MSGID MSGID-PLURAL        перекласти MSGID (однина) / MSGID-PLURAL (множина)\n"
-"  ЧИСЛО                     вибрати однину/множину на основі цього значення\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -321,15 +331,80 @@ msgstr ""
 "змінної середовища TEXTDOMAINDIR.\n"
 "Стандартний каталог пошуку: %s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: невідомий параметр «--%s»\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: параметр «-W %s» не є однозначним\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕН_ТЕКСТУ використовувати перекладені повідомлення з\n"
+#~ "                            домену ДОМЕН_ТЕКСТУ\n"
+#~ "  -e                        дозволити використання деяких escape-послідовностей\n"
+#~ "  -E                        (ігнорується, використовується для сумісності)\n"
+#~ "  -h, --help                показати цю довідку та вийти\n"
+#~ "  -n                        не виводити наприкінці символ переведення рядка\n"
+#~ "  -V, --version             відобразити інформацію про версію та вийти\n"
+#~ "  [ДОМЕН_ТЕКСТУ] MSGID      знайти переклад повідомлення MSGID у ДОМЕН_ТЕКСТУ\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=ДОМЕН_ТЕКСТУ використовувати перекладені повідомлення з\n"
+#~ "                            вказаного домену ДОМЕН_ТЕКСТУ\n"
+#~ "  -e                        дозволити використання деяких escape-послідовностей\n"
+#~ "  -E                        (ігнорується, використовується для сумісності)\n"
+#~ "  -h, --help                показати цю довідку та вийти\n"
+#~ "  -V, --version             відобразити інформацію про версію та вийти\n"
+#~ "  [ДОМЕН_ТЕКСТУ]            знайти переклад у вказаному домені ДОМЕН_ТЕКСТУ\n"
+#~ "  MSGID MSGID-PLURAL        перекласти MSGID (однина) / MSGID-PLURAL (множина)\n"
+#~ "  ЧИСЛО                     вибрати однину/множину на основі цього значення\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Авторські права (C) %s Free Software Foundation, Inc.\n"
-#~ "Це - вільне програмне забезпечення; умови копіювання викладені у вихідному\n"
-#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n"
+#~ "Це - вільне програмне забезпечення; умови копіювання викладені у "
+#~ "вихідному\n"
+#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ "
+#~ "ПРИДАТНОСТІ\n"
 #~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index 8e95999f7..51ac66665 100644
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-30 08:06+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "X-Generator: Gtranslator 2.91.7\n"
@@ -25,81 +26,65 @@ msgstr ""
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: tùy chọn “%s” chưa rõ ràng\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn “%c%s” không cho phép có đối số\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: tùy chọn “--%s” yêu cầu một đối số\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: không nhận ra tùy chọn “--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, 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:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tùy chọn yêu cầu một đối số -- “%c”\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "hết bộ nhớ"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -108,7 +93,7 @@ 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/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Viết bởi %s.\n"
@@ -119,57 +104,57 @@ msgstr "Viết bởi %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "quá nhiều đối số"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "đối số còn thiếu"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, 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/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "Cách dùng: %s [TÙY-CHỌN] [ĐỊNH-DẠNG-HỆ-VỎ]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Thay thế giá trị của biến môi trường.\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr " -v, --variables              hiển thị những biến phát sinh theo ĐỊNH-DẠNG-HỆ-VỎ\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  hiển thị trợ giúp này rồi thoát\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               hiển thị các thông tin về phiên bản rồi thoát\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -186,7 +171,7 @@ msgstr ""
 "được tham chiếu theo định dạng trình bao đó, không thì thay thế tất cả các\n"
 "tham chiếu biến môi trường xảy ra trong đầu vào tiêu chuẩn.\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -200,28 +185,29 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Hãy thông báo lỗi nào cho <bug-gnu-gettext@gnu.org>.\n"
-"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi.html>.\n"
+"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi."
+"html>.\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "gặp lỗi khi đọc “%s”"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "đầu vào tiêu chuẩn"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -231,33 +217,57 @@ msgstr ""
 "      hay: %s [TÙY_CHỌN] -s [MSGID]…\n"
 
 # Trong văn cảnh này, ngôn ngữ "native" của ai?
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Hiển thị bản dịch ngôn ngữ mẹ đẻ của một chuỗi nguyên văn.\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=MIỀN_VĂN_BẢN lấy các chuỗi đã dịch từ MIỀN_VĂN_BẢN này\n"
-"  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
-"  -E                        (bị bỏ qua để tương thích)\n"
-"  -h, --help                hiện trợ giúp này rồi thoát\n"
-"  -n                        thu hồi ký tự dòng mới theo sau\n"
-"  -V, --version             hiện thông tin phiên bản rồi thoát\n"
-"  [MIỀN_VĂN_BẢN] MSGID      lấy chuỗi đã dịch tương ứng với MSGID\n"
-"                            từ MIỀN_VĂN_BẢN\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  hiển thị trợ giúp này rồi thoát\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr ""
+"  -V, --version               hiển thị các thông tin về phiên bản rồi thoát\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -279,12 +289,12 @@ msgstr ""
 "bằng bản dịch tương ứng.\n"
 "Thư mục thường dùng để quét tìm các bản dịch: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [MIỀN_VĂN_BẢN] MSGID MSGID-NHIỀU SỐ_LƯỢNG\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -293,28 +303,31 @@ msgstr ""
 "Hiển thị bản dịch ngôn ngữ mẹ đẻ của chuỗi thuộc văn bản có dạng\n"
 "ngữ pháp phụ thuộc vào con số.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=MIỀN_VĂN_BẢN lấy chuỗi đã dịch từ “MIỀN_VĂN_BẢN” này\n"
-"  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
-"  -E                        (bị bỏ qua để không tương thích)\n"
-"  -h, --help                hiện trợ giúp này rồi thoát\n"
-"  -V, --version             hiện thông tin phiên bản rồi thoát\n"
-"  [MIỀN_VĂN_BẢN]            lấy chuỗi đã dịch từ miền văn bản này\n"
-"  MSGID MSGID-NHIỀU         dịch MSGID (số ít) / MSGID-NHIỀU (số nhiều)\n"
-"  SỐ_ĐẾM                    chọn dạng số ít/số nhiều dựa vào giá trị này\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -328,3 +341,63 @@ msgstr ""
 "bản dịch trong thư mục bình thường, vị trí khác có thể được\n"
 "chỉ ra 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 quét tiêu chuẩn: %s\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: không nhận ra tùy chọn “--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=MIỀN_VĂN_BẢN lấy các chuỗi đã dịch từ MIỀN_VĂN_BẢN này\n"
+#~ "  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
+#~ "  -E                        (bị bỏ qua để tương thích)\n"
+#~ "  -h, --help                hiện trợ giúp này rồi thoát\n"
+#~ "  -n                        thu hồi ký tự dòng mới theo sau\n"
+#~ "  -V, --version             hiện thông tin phiên bản rồi thoát\n"
+#~ "  [MIỀN_VĂN_BẢN] MSGID      lấy chuỗi đã dịch tương ứng với MSGID\n"
+#~ "                            từ MIỀN_VĂN_BẢN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=MIỀN_VĂN_BẢN lấy chuỗi đã dịch từ “MIỀN_VĂN_BẢN” này\n"
+#~ "  -e                        cho phép mở rộng một số kiểu thoát chuỗi\n"
+#~ "  -E                        (bị bỏ qua để không tương thích)\n"
+#~ "  -h, --help                hiện trợ giúp này rồi thoát\n"
+#~ "  -V, --version             hiện thông tin phiên bản rồi thoát\n"
+#~ "  [MIỀN_VĂN_BẢN]            lấy chuỗi đã dịch từ miền văn bản này\n"
+#~ "  MSGID MSGID-NHIỀU         dịch MSGID (số ít) / MSGID-NHIỀU (số nhiều)\n"
+#~ "  SỐ_ĐẾM                    chọn dạng số ít/số nhiều dựa vào giá trị này\n"
diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po
index 1a9ff91f3..6daf66099 100644
--- a/gettext-runtime/po/zh_CN.po
+++ b/gettext-runtime/po/zh_CN.po
@@ -8,100 +8,87 @@
 # LI Daobing <lidaobing@gmail.com>, 2008.
 # Aron Xu <happyaron.xu@gmail.com>, 2010.
 # Ji ZhengYu <zhengyuji@gmail.com>, 2015.
+# Boyuan Yang <073plan@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2015-09-01 10:02中国标准时间\n"
-"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-11-15 18:21+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：选项“%s”是不明确的；可能是:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s：选项“%s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：选项“--%s”不允许有参数\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s：选项“%s”是不明确的；可能是:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s：无法识别的选项“%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s：无法识别的选项“--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s：无法识别的选项“%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效选项 ─ %c\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要一个参数 ─ %c\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s：选项“-W %s”是不明确的\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：选项“-W %s”不允许有参数\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：选项“%s”需要一个参数\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -110,7 +97,7 @@ msgstr ""
 "这是自由软件: 你有修改和再发布的自由。\n"
 "本软件在法律允许的范围内不提供任何担保。\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
@@ -120,57 +107,57 @@ msgstr "由 %s 编写。\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "参数过多"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "缺少了参数"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "试试“%s --help”来获取更多信息。\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "用法：%s [选项] [SHELL格式]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "替换环境变量的值。\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             输出 SHELL格式 中出现的变量\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -184,7 +171,7 @@ msgstr ""
 "格式给出的环境变量引用会被替换成相应的值。如果给出了 SHELL格式，则只有在该格式\n"
 "中引用的环境变量会被替换；否则，标准输入中出现的全部环境变量引用都将被替换。\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -197,25 +184,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”时出错"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "标准输入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -224,42 +211,57 @@ msgstr ""
 "用法：%s [选项] [[文本域] MSGID]\n"
 "或：  %s [选项] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "显示某原文消息的本地语言翻译。\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=文本域       由<文本域>读取翻译后的消息\n"
-"  -e                        允许展开某些转义字符\n"
-"  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
-"  -h, --help                显示此段说明消息并退出\n"
-"  -n                        禁用尾随的换行符\n"
-"  -V, --version             显示版本信息并退出\n"
-"  [文本域] MSGID            由<文本域>读取相应于 MSGID 的翻译消息\n"
-
-#: src/gettext.c:265
-#, fuzzy, c-format, no-wrap
-#| msgid ""
-#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#| "regular directory, another location can be specified with the environment\n"
-#| "variable TEXTDOMAINDIR.\n"
-#| "When used with the -s option the program behaves like the `echo' command.\n"
-#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
-#| "found in the selected catalog are translated.\n"
-#| "Standard search directory: %s\n"
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  显示此帮助并退出\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               输出版本信息并退出\n"
+
+#: src/gettext.c:285
+#, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
@@ -277,40 +279,43 @@ msgstr ""
 "输出，而是寻找消息一览表文件里翻译过的消息。\n"
 "标准的搜索目录为：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [选项] [文本域] MSGID 复数-MSGID 数字\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "显示某原文消息的本地语言翻译，而翻译的语法和数字有关。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=文本域       由<文本域>读取翻译后的消息。\n"
-"  -e                        允许展开某些转义字符\n"
-"  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
-"  -h, --help                显示此段说明并退出\n"
-"  -V, --version             显示版本信息并退出\n"
-"  [文本域]                  由<文本域>读取翻译消息\n"
-"  MSGID 复数-MSGID          翻译 MSGID (单数) / 复数-MSGID (复数)\n"
-"  数字                      根据<数字>来选择单数或复数型态\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -324,5 +329,64 @@ msgstr ""
 "消息一览表文件所在的位置。\n"
 "标准的搜索目录为：%s\n"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s：选项“--%s”不允许有参数\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s：无法识别的选项“--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s：选项“-W %s”是不明确的\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s：选项“-W %s”不允许有参数\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s：选项“%s”需要一个参数\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=文本域       由<文本域>读取翻译后的消息\n"
+#~ "  -e                        允许展开某些转义字符\n"
+#~ "  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
+#~ "  -h, --help                显示此段说明消息并退出\n"
+#~ "  -n                        禁用尾随的换行符\n"
+#~ "  -V, --version             显示版本信息并退出\n"
+#~ "  [文本域] MSGID            由<文本域>读取相应于 MSGID 的翻译消息\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=文本域       由<文本域>读取翻译后的消息。\n"
+#~ "  -e                        允许展开某些转义字符\n"
+#~ "  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
+#~ "  -h, --help                显示此段说明并退出\n"
+#~ "  -V, --version             显示版本信息并退出\n"
+#~ "  [文本域]                  由<文本域>读取翻译消息\n"
+#~ "  MSGID 复数-MSGID          翻译 MSGID (单数) / 复数-MSGID (复数)\n"
+#~ "  数字                      根据<数字>来选择单数或复数型态\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 bc3c22dc9..c3625b859 100644
--- a/gettext-runtime/po/zh_HK.po
+++ b/gettext-runtime/po/zh_HK.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:54+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -18,150 +18,135 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gettext-tools/lib/closeout.c:64
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: ../gettext-tools/lib/error.c:121
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: ../gettext-tools/lib/getopt.c:551 ../gettext-tools/lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s：選項「%s」不明確\n"
 
-#: ../gettext-tools/lib/getopt.c:603 ../gettext-tools/lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s：選項「--%s」不允許有參數\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s：選項「%s」不明確\n"
 
-#: ../gettext-tools/lib/getopt.c:616 ../gettext-tools/lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s：無法識別選項「%c%s」\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: ../gettext-tools/lib/getopt.c:667 ../gettext-tools/lib/getopt.c:689
-#: ../gettext-tools/lib/getopt.c:1020 ../gettext-tools/lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s：選項「%s」需要參數\n"
 
-#: ../gettext-tools/lib/getopt.c:727 ../gettext-tools/lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s：無法識別選項「--%s」\n"
-
-#: ../gettext-tools/lib/getopt.c:738 ../gettext-tools/lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s：無法識別選項「%c%s」\n"
-
-#: ../gettext-tools/lib/getopt.c:796 ../gettext-tools/lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：選項不合法 -- %c\n"
-
-#: ../gettext-tools/lib/getopt.c:805 ../gettext-tools/lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: ../gettext-tools/lib/getopt.c:863 ../gettext-tools/lib/getopt.c:882
-#: ../gettext-tools/lib/getopt.c:1095 ../gettext-tools/lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: ../gettext-tools/lib/getopt.c:935 ../gettext-tools/lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s：選項「-W %s」不明確\n"
-
-#: ../gettext-tools/lib/getopt.c:978 ../gettext-tools/lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s：選項「-W %s」不允許有參數\n"
-
-#: ../gettext-tools/lib/xmalloc.c:41
+#: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"版權所有 (C) %s Free Software Foundation, Inc.\n"
-"這是自由軟件；請參考源代碼的版權聲明。本軟件不提供任何保證，甚至不會包括\n"
-"可售性和適用於任何特定目的的保證。\n"
 
-#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/envsubst.c:119
+#: src/envsubst.c:118
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "參數過多"
 
-#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "缺少了參數"
 
-#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n"
 
-#: src/envsubst.c:177
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "用法：%s [選項] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:182
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "替換環境變數的值。\n"
 
-#: src/envsubst.c:186
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "操作模式:\n"
 
-#: src/envsubst.c:189
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             顯示 SHELL-FORMAT 中出現過的環境變數\n"
 
-#: src/envsubst.c:193
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊:\n"
 
-#: src/envsubst.c:196
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示這段說明文字並結束\n"
 
-#: src/envsubst.c:199
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊並結束\n"
 
-#: src/envsubst.c:203
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -175,7 +160,7 @@ msgstr ""
 "${VARIABLE}) 轉換為該變數的值，並在標準輸出顯示結果。如果指定了 SHELL-FORMAT，\n"
 "則只替換 SHELL-FORMAT 中指定的變數，否則所有環境變數都會替換。\n"
 
-#: src/envsubst.c:212
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -184,25 +169,29 @@ msgstr ""
 "如果使用 --variables 選項，將不會理會輸入資料，只會讀取 SHELL-FORMAT 中的\n"
 "環境變數並顯示變數名稱，每個一行。\n"
 
-#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
-#: src/envsubst.c:439
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取「%s」時出現錯誤"
 
-#: src/envsubst.c:440
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "標準輸入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -211,39 +200,72 @@ msgstr ""
 "用法：%s [選項] [[文字領域] MSGID]\n"
 "或：  %s [選項] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "顯示某個文字訊息的本地語言翻譯。\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息\n"
-"  -e                        允許展開某類 escape sequence\n"
-"  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
-"  -h, --help                顯示這段說明文字並結束\n"
-"  -n                        去除末端的 newline 字元\n"
-"  -V, --version             顯示版本資訊並結束\n"
-"  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
-
-#: src/gettext.c:265
-#, c-format, no-wrap
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  顯示這段說明文字並結束\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               顯示版本資訊並結束\n"
+
+#: src/gettext.c:285
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#| "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#| "regular directory, another location can be specified with the environment\n"
+#| "variable TEXTDOMAINDIR.\n"
+#| "When used with the -s option the program behaves like the `echo' command.\n"
+#| "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#| "found in the selected catalog are translated.\n"
+#| "Standard search directory: %s\n"
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those messages\n"
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
@@ -255,40 +277,43 @@ msgstr ""
 "而是尋找訊息資料檔裏翻譯過的訊息。\n"
 "標準的搜尋目錄為：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數字\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "顯示某文字訊息的本地語言翻譯，而翻譯的文法受單數複數影響。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息。\n"
-"  -e                        允許展開某類 escape sequence\n"
-"  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
-"  -h, --help                顯示這段說明文字並結束\n"
-"  -V, --version             顯示版本資訊並結束\n"
-"  [文字領域]                由<文字領域>讀取翻譯訊息\n"
-"  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
-"  數字                      根據<數字>來選擇單數或複數型態\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -301,3 +326,72 @@ msgstr ""
 "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n"
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s：選項「--%s」不允許有參數\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s：無法識別選項「--%s」\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：選項不合法 -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s：選項「-W %s」不明確\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s：選項「-W %s」不允許有參數\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "版權所有 (C) %s Free Software Foundation, Inc.\n"
+#~ "這是自由軟件；請參考源代碼的版權聲明。本軟件不提供任何保證，甚至不會包括\n"
+#~ "可售性和適用於任何特定目的的保證。\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息\n"
+#~ "  -e                        允許展開某類 escape sequence\n"
+#~ "  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
+#~ "  -h, --help                顯示這段說明文字並結束\n"
+#~ "  -n                        去除末端的 newline 字元\n"
+#~ "  -V, --version             顯示版本資訊並結束\n"
+#~ "  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息。\n"
+#~ "  -e                        允許展開某類 escape sequence\n"
+#~ "  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
+#~ "  -h, --help                顯示這段說明文字並結束\n"
+#~ "  -V, --version             顯示版本資訊並結束\n"
+#~ "  [文字領域]                由<文字領域>讀取翻譯訊息\n"
+#~ "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
+#~ "  數字                      根據<數字>來選擇單數或複數型態\n"
diff --git a/gettext-runtime/po/zh_TW.po b/gettext-runtime/po/zh_TW.po
index ca942e7a0..e0927ec9c 100644
--- a/gettext-runtime/po/zh_TW.po
+++ b/gettext-runtime/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-10-08 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -18,87 +18,72 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：選項 %s 是模稜兩可的；可能選項包括："
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s：選項 %s 是模稜兩可的\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：選項 --%s 不允許有引數\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s：選項 %s 是模稜兩可的；可能選項包括："
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s：無法識別選項 %c%s\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s：選項 %c%s 不允許有引數\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s：選項 %s 需要一個引數\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s：無法識別選項 --%s\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s：無法識別選項 %c%s\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要一個引數 -- %c\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s：選項 -W %s 是模稜兩可的\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：選項 -W %s 不允許有引數\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項 -W %s 需要一個引數\n"
-
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
-#, c-format, no-wrap
+#: src/envsubst.c:112 src/gettext.c:137 src/ngettext.c:126
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -107,7 +92,7 @@ msgstr ""
 "這是自由軟體；請參考原始碼的著作權聲明。本軟體不提供任何保證，甚至不會包括\n"
 "可售性和適用於任何特定目的的保證。\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:143 src/ngettext.c:132
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
@@ -117,57 +102,57 @@ msgstr "由 %s 編寫。\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:161 src/ngettext.c:144
 #, c-format
 msgid "too many arguments"
 msgstr "引數過多"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:171 src/ngettext.c:156
 #, c-format
 msgid "missing arguments"
 msgstr "缺少引數"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:176 src/gettext.c:248 src/ngettext.c:213
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "如果想獲取額外資訊，請嘗試執行 %s --help。\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "用法：%s [選項] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "替換環境變數的值。\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:190
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "操作模式:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:193
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
 msgstr "  -v, --variables             顯示 SHELL-FORMAT 中出現過的環境變數\n"
 
-#: src/envsubst.c:192
+#: src/envsubst.c:197 src/gettext.c:277 src/ngettext.c:243
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:200
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示這段說明文字並結束\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊並結束\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:207
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -181,7 +166,7 @@ msgstr ""
 "${VARIABLE}) 轉換為該變數的值，並在標準輸出顯示結果。如果指定了 SHELL-FORMAT，\n"
 "則只替換 SHELL-FORMAT 中指定的變數，否則所有環境變數都會替換。\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:216
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -194,25 +179,25 @@ 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/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:224 src/gettext.c:300 src/ngettext.c:263
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:448
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取「%s」時出現錯誤"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:448
 msgid "standard input"
 msgstr "標準輸入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:143 src/ngettext.c:132
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:244
+#: src/gettext.c:253
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -221,32 +206,56 @@ msgstr ""
 "用法：%s [選項] [[文字領域] MSGID]\n"
 "或：  %s [選項] -s [MSGID]...\n"
 
-#: src/gettext.c:250
+#: src/gettext.c:259
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "顯示某個文字訊息的本地語言翻譯。\n"
 
-#: src/gettext.c:254
+#: src/gettext.c:263
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/gettext.c:265 src/ngettext.c:230
+#, c-format
+msgid "  -c, --context=CONTEXT     specify context for MSGID\n"
+msgstr ""
+
+#: src/gettext.c:267 src/ngettext.c:232
+#, c-format
+msgid "  -e                        enable expansion of some escape sequences\n"
+msgstr ""
+
+#: src/gettext.c:269
+#, c-format
+msgid "  -n                        suppress trailing newline\n"
+msgstr ""
+
+#: src/gettext.c:271 src/ngettext.c:234
+#, c-format
+msgid "  -E                        (ignored for compatibility)\n"
+msgstr ""
+
+#: src/gettext.c:273
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息\n"
-"  -e                        允許展開某類 escape sequence\n"
-"  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
-"  -h, --help                顯示這段說明文字並結束\n"
-"  -n                        去除末端的 newline 字元\n"
-"  -V, --version             顯示版本資訊並結束\n"
-"  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
-
-#: src/gettext.c:265
+
+#: src/gettext.c:279 src/ngettext.c:245
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -h, --help                display this help and exit\n"
+msgstr "  -h, --help                  顯示這段說明文字並結束\n"
+
+#: src/gettext.c:281 src/ngettext.c:247
+#, fuzzy, c-format
+#| msgid "  -V, --version               output version information and exit\n"
+msgid "  -V, --version             display version information and exit\n"
+msgstr "  -V, --version               顯示版本資訊並結束\n"
+
+#: src/gettext.c:285
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -265,40 +274,43 @@ msgstr ""
 "而是尋找訊息資料檔裡翻譯過的訊息。\n"
 "標準的搜尋目錄為：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數量\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "顯示某文字訊息的本地語言翻譯，而翻譯的文法受單數複數影響。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:228
 #, c-format, no-wrap
+msgid "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+msgstr ""
+
+#: src/ngettext.c:236
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
 "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+msgstr ""
+
+#: src/ngettext.c:238
+#, c-format
+msgid ""
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+"(plural)\n"
+msgstr ""
+
+#: src/ngettext.c:240
+#, c-format
+msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息。\n"
-"  -e                        允許展開某類 escape sequence\n"
-"  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
-"  -h, --help                顯示這段說明文字並結束\n"
-"  -V, --version             顯示版本資訊並結束\n"
-"  [文字領域]                由<文字領域>讀取翻譯訊息\n"
-"  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
-"  數量                      根據 <數量> 來選擇單數或複數型態\n"
-
-#: src/ngettext.c:234
+
+#: src/ngettext.c:251
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -311,3 +323,62 @@ msgstr ""
 "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n"
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s：選項 --%s 不允許有引數\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s：無法識別選項 --%s\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s：選項 -W %s 是模稜兩可的\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s：選項 -W %s 不允許有引數\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s：選項 -W %s 需要一個引數\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息\n"
+#~ "  -e                        允許展開某類 escape sequence\n"
+#~ "  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
+#~ "  -h, --help                顯示這段說明文字並結束\n"
+#~ "  -n                        去除末端的 newline 字元\n"
+#~ "  -V, --version             顯示版本資訊並結束\n"
+#~ "  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "  -d, --domain=文字領域     由<文字領域>讀取翻譯後的訊息。\n"
+#~ "  -e                        允許展開某類 escape sequence\n"
+#~ "  -E                        (為了相容性存在的選項，不會造成任何影響)\n"
+#~ "  -h, --help                顯示這段說明文字並結束\n"
+#~ "  -V, --version             顯示版本資訊並結束\n"
+#~ "  [文字領域]                由<文字領域>讀取翻譯訊息\n"
+#~ "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
+#~ "  數量                      根據 <數量> 來選擇單數或複數型態\n"
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 2fd24290c..cd478eb5e 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/examples subdirectory of GNU gettext
-## Copyright (C) 2001-2007, 2009-2016, 2018 Free Software Foundation, Inc.
+## Copyright (C) 2001-2007, 2009-2016, 2018-2019 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -441,6 +441,7 @@ EXAMPLESPOFILES = \
   sl.po \
   sr.po \
   sv.po \
+  ta.po \
   tr.po \
   uk.po \
   vi.po \
diff --git a/gettext-tools/examples/hello-c++-gnome/po/LINGUAS b/gettext-tools/examples/hello-c++-gnome/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c++-gnome/po/LINGUAS
+++ b/gettext-tools/examples/hello-c++-gnome/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c++-kde/po/LINGUAS b/gettext-tools/examples/hello-c++-kde/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c++-kde/po/LINGUAS
+++ b/gettext-tools/examples/hello-c++-kde/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c++-qt/po/LINGUAS b/gettext-tools/examples/hello-c++-qt/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c++-qt/po/LINGUAS
+++ b/gettext-tools/examples/hello-c++-qt/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS b/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c++/po/LINGUAS b/gettext-tools/examples/hello-c++/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c++/po/LINGUAS
+++ b/gettext-tools/examples/hello-c++/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c-gnome/po/LINGUAS b/gettext-tools/examples/hello-c-gnome/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c-gnome/po/LINGUAS
+++ b/gettext-tools/examples/hello-c-gnome/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c-gnome3/po/LINGUAS b/gettext-tools/examples/hello-c-gnome3/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c-gnome3/po/LINGUAS
+++ b/gettext-tools/examples/hello-c-gnome3/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-c/po/LINGUAS b/gettext-tools/examples/hello-c/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-c/po/LINGUAS
+++ b/gettext-tools/examples/hello-c/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-clisp/po/LINGUAS b/gettext-tools/examples/hello-clisp/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-clisp/po/LINGUAS
+++ b/gettext-tools/examples/hello-clisp/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-csharp-forms/po/LINGUAS b/gettext-tools/examples/hello-csharp-forms/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/LINGUAS
+++ b/gettext-tools/examples/hello-csharp-forms/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-csharp/po/LINGUAS b/gettext-tools/examples/hello-csharp/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-csharp/po/LINGUAS
+++ b/gettext-tools/examples/hello-csharp/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-gawk/po/LINGUAS b/gettext-tools/examples/hello-gawk/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-gawk/po/LINGUAS
+++ b/gettext-tools/examples/hello-gawk/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-guile/po/LINGUAS b/gettext-tools/examples/hello-guile/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-guile/po/LINGUAS
+++ b/gettext-tools/examples/hello-guile/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-java-awt/po/LINGUAS b/gettext-tools/examples/hello-java-awt/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-java-awt/po/LINGUAS
+++ b/gettext-tools/examples/hello-java-awt/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS b/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS
+++ b/gettext-tools/examples/hello-java-qtjambi/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-java-swing/po/LINGUAS b/gettext-tools/examples/hello-java-swing/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-java-swing/po/LINGUAS
+++ b/gettext-tools/examples/hello-java-swing/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-java/po/LINGUAS b/gettext-tools/examples/hello-java/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-java/po/LINGUAS
+++ b/gettext-tools/examples/hello-java/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-librep/po/LINGUAS b/gettext-tools/examples/hello-librep/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-librep/po/LINGUAS
+++ b/gettext-tools/examples/hello-librep/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-objc-gnome/po/LINGUAS b/gettext-tools/examples/hello-objc-gnome/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-objc-gnome/po/LINGUAS
+++ b/gettext-tools/examples/hello-objc-gnome/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS b/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS
+++ b/gettext-tools/examples/hello-objc-gnustep/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-objc/po/LINGUAS b/gettext-tools/examples/hello-objc/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-objc/po/LINGUAS
+++ b/gettext-tools/examples/hello-objc/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-pascal/po/LINGUAS b/gettext-tools/examples/hello-pascal/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-pascal/po/LINGUAS
+++ b/gettext-tools/examples/hello-pascal/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-perl/po/LINGUAS b/gettext-tools/examples/hello-perl/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-perl/po/LINGUAS
+++ b/gettext-tools/examples/hello-perl/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-php/po/LINGUAS b/gettext-tools/examples/hello-php/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-php/po/LINGUAS
+++ b/gettext-tools/examples/hello-php/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-python/po/LINGUAS b/gettext-tools/examples/hello-python/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-python/po/LINGUAS
+++ b/gettext-tools/examples/hello-python/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-sh/po/LINGUAS b/gettext-tools/examples/hello-sh/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-sh/po/LINGUAS
+++ b/gettext-tools/examples/hello-sh/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-smalltalk/po/LINGUAS b/gettext-tools/examples/hello-smalltalk/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-smalltalk/po/LINGUAS
+++ b/gettext-tools/examples/hello-smalltalk/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-tcl-tk/po/LINGUAS b/gettext-tools/examples/hello-tcl-tk/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/LINGUAS
+++ b/gettext-tools/examples/hello-tcl-tk/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-tcl/po/LINGUAS b/gettext-tools/examples/hello-tcl/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-tcl/po/LINGUAS
+++ b/gettext-tools/examples/hello-tcl/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/hello-ycp/po/LINGUAS b/gettext-tools/examples/hello-ycp/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/hello-ycp/po/LINGUAS
+++ b/gettext-tools/examples/hello-ycp/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/po/LINGUAS b/gettext-tools/examples/po/LINGUAS
index 339c7f92f..0b1f44eac 100644
--- a/gettext-tools/examples/po/LINGUAS
+++ b/gettext-tools/examples/po/LINGUAS
@@ -2,4 +2,4 @@
 # This file is in the public domain.
 #
 # Set of available languages.
-af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_HK zh_TW
+af ast bg ca cs da de el eo es fi fr ga gl hr hu id it ja ky lv ms mt nb nl pl pt pt_BR ro ru sk sl sr sv ta tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/po/af.po b/gettext-tools/examples/po/af.po
index cecc5bf4f..ec6f9955c 100644
--- a/gettext-tools/examples/po/af.po
+++ b/gettext-tools/examples/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2003-12-31 10:30+2\n"
 "Last-Translator: Ysbeer <ysbeer@af.org.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -15,35 +15,74 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo wêreld!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
-#: hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Hierdie program loop as prosesnommer %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Hierdie program loop as prosesnommer %d."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Hierdie program loop as prosesnommer %1."
@@ -56,28 +95,29 @@ msgstr "Hallo voorbeeld"
 msgid "Hello world example"
 msgstr "Hallo wêreld voorbeeld"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Hierdie program loop as prosesnommer $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Hierdie program loop as prosesnommer %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14
-#, lisp-format
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Hierdie program loop as prosesnommer ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Hierdie program loop as prosesnommer {0}."
 
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Hierdie program loop as prosesnommer {pid}"
diff --git a/gettext-tools/examples/po/ast.po b/gettext-tools/examples/po/ast.po
index 40cec31a8..ec1512df4 100644
--- a/gettext-tools/examples/po/ast.po
+++ b/gettext-tools/examples/po/ast.po
@@ -1,88 +1,127 @@
-# Mensajes en asturianu para GNU gettext.
+# Asturian translation for gettext-examples
+# Copyright (C) 2018 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Copyright (C) 2009 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2009 Free Software Foundation, Inc.
+#
 # Marquinos <maacub@gmail.com>, 2009.
+# enolp <enolp@softastur.org>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples-0.17\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-18 03:08+0200\n"
-"PO-Revision-Date: 2009-12-15 12:16+0100\n"
-"Last-Translator: Marquinos <maacub@gmail.com>\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2018-07-16 00:28+0100\n"
+"Last-Translator: enolp <enolp@softastur.org>\n"
 "Language-Team: Asturian <ubuntu-l10n-ast@lists.ubuntu.com>\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "�Hola, mundu!"
+msgstr "¡Hola, mundu!"
 
 #: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu %d."
+msgstr "Esti programa ta executándose como procesu númberu %d."
+
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>¡Hola mundu!</big>\n"
+"Esti programa ta executándose como procesu númberu <b>%d</b>."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>Esto ye otru testu</u></big>"
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>Esto ye otru testu más</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Hola"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "Aplicación d'exemplu"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "Anovar testu"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "Usar marques XML"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "Usa o non marques XML nel testu."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu %1."
+msgstr "Esti programa ta executándose como procesu númberu %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
-msgstr "Hola exemplu"
+msgstr "Hola d'exemplu"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Exemplu de hola mundu"
+msgstr "Hola mundu d'exemplu"
 
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu $pid."
+msgstr "Esti programa ta executándose como procesu númberu $pid."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu %(pid)d."
+msgstr "Esti programa ta executándose como procesu númberu %(pid)d."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu ~D."
+msgstr "Esti programa ta executándose como procesu númberu ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu {0}."
+msgstr "Esti programa ta executándose como procesu númberu {0}."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Esti programa ta corriendo como'l procesu n�mberu {pid}."
+msgstr "Esti programa ta executándose como procesu númberu {pid}."
diff --git a/gettext-tools/examples/po/bg.po b/gettext-tools/examples/po/bg.po
index 9a90469f1..b176ebcd0 100644
--- a/gettext-tools/examples/po/bg.po
+++ b/gettext-tools/examples/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-24 08:27+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -15,21 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -39,9 +39,8 @@ msgstr "Здравейте на всички !"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Програмата е пусната под процес номер %d."
@@ -67,19 +66,19 @@ msgstr "<big><i>А това е един друг текст</i></big>"
 msgid "Hello"
 msgstr "Здравейте"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Примерно приложение"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Обноваване на текст"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Използване на XML markup"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Дали да се използва XML markup за текста."
 
diff --git a/gettext-tools/examples/po/ca.po b/gettext-tools/examples/po/ca.po
index 2a9d24f41..1d776b369 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-24 18:48+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -22,15 +23,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,9 +40,8 @@ msgstr "Hola, món!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Aquest programa està corrent amb el número de procés %d."
@@ -68,19 +67,19 @@ msgstr "<big><i>Aquest és un altre text més</i></big>"
 msgid "Hello"
 msgstr "Hola"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Aplicació d’exemple"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Actualitza el text"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Empra etiquetatge XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Indica si es permet emprar etiquetatge XML al text."
 
diff --git a/gettext-tools/examples/po/cs.po b/gettext-tools/examples/po/cs.po
index aa683099c..14f64d4c6 100644
--- a/gettext-tools/examples/po/cs.po
+++ b/gettext-tools/examples/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-26 08:43+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -23,15 +24,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -41,9 +41,8 @@ msgstr "Ahoj světe!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tento program běží jako proces číslo %d."
@@ -69,19 +68,19 @@ msgstr "<big><u>Toto je nějaký ještě další text</u></big>"
 msgid "Hello"
 msgstr "Ahoj"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Ukázková aplikace"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Aktualizovat text"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Používat značkovací jazyk XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Zda v textu používat značkovací jazyk XML."
 
diff --git a/gettext-tools/examples/po/da.po b/gettext-tools/examples/po/da.po
index 03b74f0e0..4fff8ec1b 100644
--- a/gettext-tools/examples/po/da.po
+++ b/gettext-tools/examples/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-27 12:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,21 +17,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -41,9 +41,8 @@ msgstr "Hej verden!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dette program kører som proces nummer %d."
@@ -69,19 +68,19 @@ msgstr "<big><i>Endnu en tekst</i></big>"
 msgid "Hello"
 msgstr "Hej"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Eksempelprogram"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Opdater tekst"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Brug XML-opmærkning"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Hvorvidt der skal bruges XML-opmærkning i teksten."
 
diff --git a/gettext-tools/examples/po/de.po b/gettext-tools/examples/po/de.po
index 6161fdc91..97d5730a9 100644
--- a/gettext-tools/examples/po/de.po
+++ b/gettext-tools/examples/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-26 13:05+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -27,15 +28,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -45,9 +45,8 @@ msgstr "Hallo Welt!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
@@ -73,19 +72,19 @@ msgstr "<big<i>Dies ist noch ein weiterer Text</i></big>"
 msgid "Hello"
 msgstr "Hallo"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Beispielanwendung"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Text aktualisieren"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "XML-Markup verwenden"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Ob XML-Markup im Text verwendet werden soll"
 
diff --git a/gettext-tools/examples/po/el.po b/gettext-tools/examples/po/el.po
index 329fdcdda..26e905d39 100644
--- a/gettext-tools/examples/po/el.po
+++ b/gettext-tools/examples/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2004-01-17 17:57+0100\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2005-01-06 18:50+0000\n"
 "Last-Translator: Simos Xenitellis <simos74@gmx.net>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,37 +14,75 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Γεια σου, κόσμε!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
-#: hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %1."
@@ -57,28 +95,29 @@ msgstr "Παράδειγμα χαιρετισμού"
 msgid "Hello world example"
 msgstr "Παράδειγμα \"γεια σου κόσμε\""
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14
-#, lisp-format
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας {pid}."
diff --git a/gettext-tools/examples/po/eo.po b/gettext-tools/examples/po/eo.po
index 17a6a9c9f..5cd386255 100644
--- a/gettext-tools/examples/po/eo.po
+++ b/gettext-tools/examples/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2016-02-22 08:54-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,9 +40,8 @@ msgstr "Saluton, mondo!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
@@ -68,19 +67,19 @@ msgstr "<big><i>Tio ĉi estas pli alia teksto</i></big>"
 msgid "Hello"
 msgstr "Saluton"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Ekzempla aplikaĵo"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Ĝisdatigi tekston"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Uzi marklingvon XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Ĉu uzi marklingvon XML en la teksto."
 
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index ac5ce6104..a40bee29b 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 22:44+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -25,15 +26,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -43,9 +43,8 @@ msgstr "¡Hola, mundo!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está corriendo como el proceso número %d."
@@ -71,19 +70,19 @@ msgstr "<big><i>Este es otro texto más</t></big>"
 msgid "Hello"
 msgstr "Hola"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Ejemplo de aplicación"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Actualizar texto"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Utilizar etiquetas XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Si utilizar etiquetas XML en el texto."
 
diff --git a/gettext-tools/examples/po/fi.po b/gettext-tools/examples/po/fi.po
index 21b90e154..bc49b91ba 100644
--- a/gettext-tools/examples/po/fi.po
+++ b/gettext-tools/examples/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-09-01 16:59+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.5.4\n"
 
 # Tämä nimenomainen käännös valittu GNU Hellon mukaisesti.
@@ -24,15 +25,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +42,8 @@ msgstr "Terve maailma!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tämän ohjelman prosessinumero on %d."
@@ -70,19 +69,19 @@ msgstr "<big><i>Tämä on vielä toinen teksti</i></big>"
 msgid "Hello"
 msgstr "Hei"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Esimerkkisovellus"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Päivitä teksti"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Käytä XML-merkintäkieltä"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Käytetäänkö XML-merkintäkieltä tekstissä."
 
diff --git a/gettext-tools/examples/po/fr.po b/gettext-tools/examples/po/fr.po
index 1a16bfdf5..3ae2dd86e 100644
--- a/gettext-tools/examples/po/fr.po
+++ b/gettext-tools/examples/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-12-22 23:54+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -25,15 +26,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -43,9 +43,8 @@ msgstr "Bonjour, le monde !"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ce programme est exécuté en tant que processus numéro %d."
@@ -71,19 +70,19 @@ msgstr "<big><i>Ceci est encore un autre texte</i></big>"
 msgid "Hello"
 msgstr "Bonjour"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Application d’exemple"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Actualiser le texte"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Utiliser le balisage XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "De quelle manière utiliser le balisage XML dans le texte."
 
diff --git a/gettext-tools/examples/po/ga.po b/gettext-tools/examples/po/ga.po
index 0868b0611..ee86e474e 100644
--- a/gettext-tools/examples/po/ga.po
+++ b/gettext-tools/examples/po/ga.po
@@ -1,53 +1,92 @@
 # Irish translations for gettext-examples.
-# Copyright (C) 2004 Yoyodyne, Inc.
-# This file is distributed under the same license as the gettext-examples package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2004.
+# Copyright (C) 2015 Yoyodyne, Inc. (msgids)
+# This file is distributed under the same license as the gettext package.
+# Kevin Patrick Scannell <kscanne@gmail.com>, 2004, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.14.1\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2004-01-17 17:57+0100\n"
-"PO-Revision-Date: 2005-02-07 12:09-0500\n"
-"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2017-01-10 12:09-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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
-#: hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "T� an cl�r seo � rith mar phr�iseas %d."
+msgstr "Tá an clár seo ag rith mar phróiseas %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>Dia dhuit a dhomhain!</big>\n"
+"Tá an clár seo ag rith mar phróiseas <b>%d</b>."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>Seo é téacs eile</u></big>"
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>Seo é téacs eile fós</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Dia dhuit"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "Feidhmchlár Samplach"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "Nuashonraigh an téacs"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "Úsáid marcáil XML"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "An úsáidfear marcáil XML sa téacs."
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "T� an cl�r seo � rith mar phr�iseas %1."
+msgstr "Tá an clár seo ag rith mar phróiseas %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
@@ -57,28 +96,29 @@ msgstr "Sampla `Dia duit'"
 msgid "Hello world example"
 msgstr "Sampla `Dia duit a dhomhain'"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "T� an cl�r seo � rith mar phr�iseas $pid."
+msgstr "Tá an clár seo ag rith mar phróiseas $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "T� an cl�r seo � rith mar phr�iseas %(pid)d."
+msgstr "Tá an clár seo ag rith mar phróiseas %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14
-#, lisp-format
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "T� an cl�r seo � rith mar phr�iseas ~D."
+msgstr "Tá an clár seo ag rith mar phróiseas ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "T� an cl�r seo � rith mar phr�iseas {0}."
+msgstr "Tá an clár seo ag rith mar phróiseas {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "T� an cl�r seo � rith mar phr�iseas {pid}."
+msgstr "Tá an clár seo ag rith mar phróiseas {pid}."
diff --git a/gettext-tools/examples/po/gl.po b/gettext-tools/examples/po/gl.po
index cfaf0c512..4ca64477d 100644
--- a/gettext-tools/examples/po/gl.po
+++ b/gettext-tools/examples/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2014-05-10 16:34+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -19,14 +19,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
-#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
-#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
-#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
-#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
-#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
 #: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
 #: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
 #: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
@@ -39,22 +40,52 @@ msgstr ""
 msgid "Hello, world!"
 msgstr "Ola, mundo!"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
-#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
-#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
-#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
-#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
-#: hello-php/hello.php:14
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa estase executando como o proceso número %d."
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Este programa estase executando como o proceso número %d."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Aplicativo de exemplo"
 
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff --git a/gettext-tools/examples/po/hr.po b/gettext-tools/examples/po/hr.po
index 41269e7ff..c4c65e87f 100644
--- a/gettext-tools/examples/po/hr.po
+++ b/gettext-tools/examples/po/hr.po
@@ -1,37 +1,39 @@
 # Translation of gettext-examples to Croatian.
 # Copyright © 2012 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
 #
+# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
+# Božidar Putanec <bozidarp@yahoo.com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
-"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2018-04-11 09:29-0800\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\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"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+"X-Generator: Lokalize 2.0\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -41,9 +43,8 @@ msgstr "Pozdrav, svijete!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ovaj program je pokrenut kao proces broj %d."
@@ -59,29 +60,29 @@ msgstr ""
 
 #: hello-c-gnome3/hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr "<big><u>Ovo je jedan drugi tekst</u></big>"
+msgstr "<big><u>Ovo je jedan drugačiji tekst</u></big>"
 
 #: hello-c-gnome3/hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr "<big><i>A ovo je još jedan drugi tekst</i></big>"
+msgstr "<big><i>A ovo je još jedan drugačiji tekst</i></big>"
 
 #: hello-c-gnome3/hello.desktop.in.in:4
 msgid "Hello"
 msgstr "Pozdrav"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Primjer uporabe"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Ažuriranje teksta"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Uporaba XML oznaka"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Da li upotrijebiti XML oznake u tekstu."
 
diff --git a/gettext-tools/examples/po/hu.po b/gettext-tools/examples/po/hu.po
index 23b689e22..ad8e62c1f 100644
--- a/gettext-tools/examples/po/hu.po
+++ b/gettext-tools/examples/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 20:31+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
@@ -24,15 +25,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +42,8 @@ msgstr "Hello, világ!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
@@ -70,19 +69,19 @@ msgstr "<big><i>Ez megint egy másik szöveg</i></big>"
 msgid "Hello"
 msgstr "Helló"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Példa alkalmazás"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Szöveg frissítése"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "XML-jelölőnyelv használata"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Használjon-e XML-jelölőnyelvet a szövegben."
 
diff --git a/gettext-tools/examples/po/id.po b/gettext-tools/examples/po/id.po
index 4ace55a39..55f64a057 100644
--- a/gettext-tools/examples/po/id.po
+++ b/gettext-tools/examples/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2006-09-27 20:19+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_heriyanto@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -15,38 +15,75 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini berjalan sebagai proses nomor %d"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Program ini berjalan sebagai proses nomor %d"
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Program ini berjalan sebagai proses nomor %1"
@@ -59,29 +96,29 @@ msgstr "Contoh hello"
 msgid "Hello world example"
 msgstr "Contoh hello world"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Program ini berjalan sebagai proses nomor $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Program ini berjalan sebagai proses nomor %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Program ini berjalan sebagai proses nomor  ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Program ini berjalan sebagai proses nomor {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Program ini berjalan sebagai proses nomor {pid}."
diff --git a/gettext-tools/examples/po/it.po b/gettext-tools/examples/po/it.po
index 9f006b587..f116e83c4 100644
--- a/gettext-tools/examples/po/it.po
+++ b/gettext-tools/examples/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-08-05 12:18+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,21 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -39,9 +39,8 @@ msgstr "Salve, mondo!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Questo programma è in esecuzione con numero di processo %d."
@@ -67,19 +66,19 @@ msgstr "<big><i>Questo è un altro testo ancora</i></big>"
 msgid "Hello"
 msgstr "Salve"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Applicazione di esempio"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Aggiorna testo"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Usa il markup XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Se usare il markup XML nel testo."
 
diff --git a/gettext-tools/examples/po/ja.po b/gettext-tools/examples/po/ja.po
index c54b35f3b..a52199df9 100644
--- a/gettext-tools/examples/po/ja.po
+++ b/gettext-tools/examples/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-24 12:14+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -15,21 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -39,9 +39,8 @@ msgstr "������, ����ˤ���!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "���Υץ������ϥץ������ֹ� %d ��ư���Ƥ��ޤ�."
@@ -67,19 +66,19 @@ msgstr "<big><i>����Ϥ���ˤ⤦��ĤΥƥ����ȤǤ�</i></big>"
 msgid "Hello"
 msgstr "����ˤ���"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "�������"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "�ƥ����Ȥ򹹿�"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "XML�ޡ������åפ����"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "�ƥ��������XML�ޡ������åפ�Ȥ����ݤ�"
 
diff --git a/gettext-tools/examples/po/ky.po b/gettext-tools/examples/po/ky.po
index 5dac47099..ee0b8a08d 100644
--- a/gettext-tools/examples/po/ky.po
+++ b/gettext-tools/examples/po/ky.po
@@ -1,31 +1,34 @@
 # Translation of 'gettext-examples' messages to Kirghiz.
-# Copyright (C) 2006 Yoyodyne, Inc.
-# This file is distributed under the same license as the silky package.
+# Copyright (C) 2004 Yoyodyne, Inc. (msgids)
+# This file is distributed under the same license as the gettext package.
 # Ilyas Bakirov <just_ilyas@yahoo.com>, 2007.
+# Ilyas Bakirov <i.bakirov@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.16.2-pre5\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-13 22:04+0200\n"
-"PO-Revision-Date: 2007-11-13 16:02+0600\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2018-02-15 18:26+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Kyrgyz\n"
-"X-Poedit-Country: KYRGYZSTAN\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
 #: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
 #: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
 #: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
@@ -38,13 +41,49 @@ msgstr "Салам дүйнө!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Бул программа %d процесс номери катары иштеп жатат."
 
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>Салам дүйнө!</big>\n"
+"Бул программа <b>%d</b> процесс номери катары иштеп жатат."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>Дагы бир текст</u></big>"
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>Жана дагы бир текст</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Салам"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "Мисал программа"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "Текстти жаңылоо"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "XML белгени колдонуу"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "Текст ичинле XML белги эсепке алынсынбы."
+
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
@@ -75,8 +114,8 @@ msgid "This program is running as process number ~D."
 msgstr "Бул программа ~D процесс номери катары иштеп жатат."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-csharp/hello.cs:17
-#: hello-csharp-forms/hello.cs:36
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Бул программа {0} процесс номери катары иштеп жатат."
diff --git a/gettext-tools/examples/po/lv.po b/gettext-tools/examples/po/lv.po
index 02045251e..02cadc4a4 100644
--- a/gettext-tools/examples/po/lv.po
+++ b/gettext-tools/examples/po/lv.po
@@ -7,30 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-18 03:08+0200\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2009-07-28 21:26+0100\n"
 "Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Poedit-Language: Latvian\n"
 "X-Poedit-Country: LATVIA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,13 +43,48 @@ msgstr "Sveika, pasaule!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Šī programma darbojas kā process ar numuru %d."
 
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Šī programma darbojas kā process ar numuru %d."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
diff --git a/gettext-tools/examples/po/ms.po b/gettext-tools/examples/po/ms.po
index 42cd6da9e..203d22bc8 100644
--- a/gettext-tools/examples/po/ms.po
+++ b/gettext-tools/examples/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-25 20:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.8.1\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -23,15 +24,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -41,9 +41,8 @@ msgstr "Hello, world!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %d."
@@ -69,19 +68,19 @@ msgstr "<big><i>Ini adalah satu lagi teks lain</i></big>"
 msgid "Hello"
 msgstr "Hello"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Contoh Aplikasi"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Kemaskini teks"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Guna penanda XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Sama ada untuk menggunakan penanda XML dalam teks."
 
diff --git a/gettext-tools/examples/po/mt.po b/gettext-tools/examples/po/mt.po
index 9deee1954..6b260f4db 100644
--- a/gettext-tools/examples/po/mt.po
+++ b/gettext-tools/examples/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-13 22:04+0200\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2008-11-18 17:27+0100\n"
 "Last-Translator: Clyde Meli <cmeli@cis.um.edu.mt>\n"
 "Language-Team: Maltese <translation-team-mt@lists.sourceforge.net>\n"
@@ -16,16 +16,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
 #: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
 #: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
 #: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
@@ -38,13 +40,48 @@ msgstr "Hello, lil kulħadd!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dal-programm qed jaħdem taħt il-proċess numru %d."
 
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "Dal-programm qed jaħdem taħt il-proċess numru %d."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
@@ -75,8 +112,8 @@ msgid "This program is running as process number ~D."
 msgstr "Dal-programm qed jaħdem taħt il-proċess numru ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-csharp/hello.cs:17
-#: hello-csharp-forms/hello.cs:36
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Dal-programm qed jaħdem taħt il-proċess numru {0}."
diff --git a/gettext-tools/examples/po/nb.po b/gettext-tools/examples/po/nb.po
index f17a18e0b..b0126b51c 100644
--- a/gettext-tools/examples/po/nb.po
+++ b/gettext-tools/examples/po/nb.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-09-19 00:04+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.9\n"
 
@@ -24,15 +25,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +42,8 @@ msgstr "Hallo verden!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dette programmet kjører som prosess nummer %d."
@@ -70,19 +69,19 @@ msgstr "<big><i>Dette er enda en tekst</i></big>"
 msgid "Hello"
 msgstr "Hallo"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Eksempelprogram"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Oppdater tekst"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Bruk XML-formatering"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Om det skal bruke XML-formatering i teksten"
 
diff --git a/gettext-tools/examples/po/nl.po b/gettext-tools/examples/po/nl.po
index d0ea747a6..2bdaeb52e 100644
--- a/gettext-tools/examples/po/nl.po
+++ b/gettext-tools/examples/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-07-01 21:10+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -27,15 +28,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -45,9 +45,8 @@ msgstr "Hallo, wereld!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dit programma draait als proces nummer %d."
@@ -73,19 +72,19 @@ msgstr "<big><i>Dit is nog weer een andere tekst</i></big>"
 msgid "Hello"
 msgstr "Hallo"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Voorbeeldtoepassing"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Tekst bijwerken"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "XML-markup gebruiken"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Of er XML-markup gebruikt moet worden in de tekst."
 
diff --git a/gettext-tools/examples/po/pl.po b/gettext-tools/examples/po/pl.po
index da2eef6ec..8b5310837 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 22:01+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -14,22 +14,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -39,9 +40,8 @@ msgstr "Cześć, świecie!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ten program działa jako proces o numerze %d."
@@ -67,19 +67,19 @@ msgstr "<big><i>To jest jeszcze inny tekst</i></big>"
 msgid "Hello"
 msgstr "Cześć"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Program przykładowy"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Aktualizacja tekstu"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Użycie znaczników XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Czy użyć znaczników XML w tekście."
 
diff --git a/gettext-tools/examples/po/pt.po b/gettext-tools/examples/po/pt.po
index 215bd5ca5..3da688f34 100644
--- a/gettext-tools/examples/po/pt.po
+++ b/gettext-tools/examples/po/pt.po
@@ -1,54 +1,95 @@
-# Portuguese translation of 'gettext-examples' package.
-# Copyright (C) 2005 Yoyodyne, Inc.
-# This file is distributed under the same license as the gettext-examples package.
+# Portuguese (Portugal) translation of 'gettext-examples' package.
+# Copyright (C) 2018 Yoyodyne, Inc. (msgids)
+# This file is distributed under the same license as the gettext package.
 # Helder Correia <helder.pereira.correia@gmail.com>, 2005.
+# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.14.5\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2005-01-29 17:39+0100\n"
-"PO-Revision-Date: 2005-11-19 23:08+0000\n"
-"Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2018-10-04 10:22+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-guile/hello.scm:16 hello-smalltalk/hello.st.in:32
-#: hello-java/Hello.java:15 hello-java-awt/Hello.java:24
-#: hello-java-swing/Hello.java:21 hello-csharp/hello.cs:15
-#: hello-csharp-forms/hello.cs:30 hello-gawk/hello.awk:12
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:16
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Olá, Mundo!"
-
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
-#: hello-php/hello.php:15
+msgstr "Olá mundo!"
+
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Este programa está a ser executado com o número de processo %d."
+msgstr "Este programa está em execução como processo nº %d."
+
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>Olá mundo!</big>\n"
+"Este programa está em execução como processo nº <b>%d</b>."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>Este é outro texto</u></big>"
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>Eis ainda outro texto</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Olá"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "Aplicação exemplo"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "Actualizar texto"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "Usar marcação XML"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "Se se deve usar marcação XML no texto."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
-msgstr "Este programa está a ser executado com o número de processo %1."
+msgstr "Este programa está em execução como processo nº %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
@@ -56,31 +97,31 @@ msgstr "Exemplo Olá"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "Exemplo Olá Mundo"
+msgstr "Exemplo Olá mundo"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Este process está a ser executado com o número de processo $pid."
+msgstr "Este programa está em execução como processo nº  $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está a ser executado com o número de processo %(pid)d."
+msgstr "Este programa está em execução como processo nº %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Este programa está a ser executado com o número de processo ~D."
+msgstr "Este programa está em execução como processo nº ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está a ser executado com o número de processo {0}."
+msgstr "Este programa está em execução como processo nº {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Este programa está a ser executado com o número de processo {pid}."
+msgstr "Este programa está em execução como processo nº {pid}."
diff --git a/gettext-tools/examples/po/pt_BR.po b/gettext-tools/examples/po/pt_BR.po
index 3eee937e3..900a3bafe 100644
--- a/gettext-tools/examples/po/pt_BR.po
+++ b/gettext-tools/examples/po/pt_BR.po
@@ -1,38 +1,39 @@
-# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2015 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Brazilian Portuguese translations for gettext-example
+# Traduções em português brasileiro para gettext-example
+# Copyright (C) 2017 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Rafael Ferreira <rffontenelle@gmail.com>, 2013, 2014, 2015.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2015, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
-"PO-Revision-Date: 2015-09-15 11:27-0300\n"
-"Last-Translator: Rafael Ferreira <rffontenelle@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2017-01-19 10:37-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+"net>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.11\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +43,8 @@ msgstr "Olá, mundo!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está executando com número de processo %d."
@@ -70,19 +70,19 @@ msgstr "<big><i>Este também é outro texto</i></big>"
 msgid "Hello"
 msgstr "Olá"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Aplicativo exemplo"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Atualizar texto"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Usar marcação XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Se deve ser usada marcação XML no texto."
 
@@ -103,29 +103,29 @@ msgstr "Olá mundo exemplo"
 #: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
-msgstr "Este programa está executando com número de processo $pid."
+msgstr "Este programa está sendo executado com número de processo $pid."
 
 #: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
-msgstr "Este programa está executando com número de processo %(pid)d."
+msgstr "Este programa está sendo executado com número de processo %(pid)d."
 
 #: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
-msgstr "Este programa está executando com número de processo ~D."
+msgstr "Este programa está sendo executado com número de processo ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
 #: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
 #: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
-msgstr "Este programa está executando com número de processo {0}."
+msgstr "Este programa está sendo executado com número de processo {0}."
 
 #: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
-msgstr "Este programa está executando com número de processo {pid}."
+msgstr "Este programa está sendo executado com número de processo {pid}."
 
 #~ msgid "Set label sensitive"
 #~ msgstr "Definir sensibilidade a rótulo"
diff --git a/gettext-tools/examples/po/ro.po b/gettext-tools/examples/po/ro.po
index 9913d71f4..57cfe0a35 100644
--- a/gettext-tools/examples/po/ro.po
+++ b/gettext-tools/examples/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 23:05+0200\n"
 "Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -16,7 +16,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 "X-Generator: Poedit 1.8.1\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -24,15 +26,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +43,8 @@ msgstr "Salut, lume!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Acest program rulează ca procesul numărul %d."
@@ -70,19 +70,19 @@ msgstr "<big><i>Acesta este încă un alt text</i></big>"
 msgid "Hello"
 msgstr "Hello"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Exemplu de aplicație"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Actualizează text"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Folosește marcaj XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Dacă se folosește marcaj XML în text."
 
diff --git a/gettext-tools/examples/po/ru.po b/gettext-tools/examples/po/ru.po
index 7fc7253c6..120c4ed05 100644
--- a/gettext-tools/examples/po/ru.po
+++ b/gettext-tools/examples/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-26 08:55+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,23 +16,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Lokalize 1.5\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"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +43,8 @@ msgstr "Здравствуй, мир!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Эта программа выполняется как процесс под номером %d."
@@ -70,19 +70,19 @@ msgstr "<big><i>И ещё один текст</i></big>"
 msgid "Hello"
 msgstr "Здравствуйте"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Пример приложения"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Обновить текст"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Использовать разметку XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Учитывать ли в тексте разметку XML."
 
diff --git a/gettext-tools/examples/po/sk.po b/gettext-tools/examples/po/sk.po
index 2cf6c6f41..baa83db47 100644
--- a/gettext-tools/examples/po/sk.po
+++ b/gettext-tools/examples/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 20:17+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -15,21 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -39,9 +39,8 @@ msgstr "Ahoj svet!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tento program beží ako proces s číslom %d."
@@ -67,19 +66,19 @@ msgstr "<big><u>Toto je ešte ďalší text</u></big>"
 msgid "Hello"
 msgstr "Ahoj"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Ukážková aplikácia"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Aktualizovať text"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Použiť značky XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Či v texte použiť značky XML."
 
diff --git a/gettext-tools/examples/po/sl.po b/gettext-tools/examples/po/sl.po
index 0cfca1366..3344c6bde 100644
--- a/gettext-tools/examples/po/sl.po
+++ b/gettext-tools/examples/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-28 10:37+0200\n"
 "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -16,22 +16,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -41,9 +42,8 @@ msgstr "Pozdravljen, svet!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ta program teče kot proces številka %d."
@@ -69,19 +69,19 @@ msgstr "<big><i>Besedilo v kurzivi</i></big>"
 msgid "Hello"
 msgstr "Zdravo"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Zgled aplikacije"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Posodobi besedilo"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Uporabi oznake XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Ali naj bodo v besedilu uporabljene oznake XML."
 
diff --git a/gettext-tools/examples/po/sr.po b/gettext-tools/examples/po/sr.po
index 542df6694..b1740bb1f 100644
--- a/gettext-tools/examples/po/sr.po
+++ b/gettext-tools/examples/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-12-23 19:12+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,22 +15,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,9 +41,8 @@ msgstr "Здраво свима!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Овај програм се извршава као процес број %d."
@@ -68,19 +68,19 @@ msgstr "<big><i>Богами и ово је још један текст</i></bi
 msgid "Hello"
 msgstr "Здраво"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Програм примера"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Опис ажурирања"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Користи ИксМЛ означавање"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Да ли ће да користи ИксМЛ означавање у тексту."
 
diff --git a/gettext-tools/examples/po/sv.po b/gettext-tools/examples/po/sv.po
index 2217f5548..41134171f 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2016-05-26 22:46+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -18,21 +18,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +42,8 @@ msgstr "Hej världen!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Detta program kör som process nummer %d."
@@ -70,19 +69,19 @@ msgstr "<big><i>Detta är ytterligare en annan text</i></big>"
 msgid "Hello"
 msgstr "Hej"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Exempelprogram"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Uppdatera text"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Använd XML-märkning"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Huruvida XML-märkning skall användas i texten."
 
diff --git a/gettext-tools/examples/po/ta.po b/gettext-tools/examples/po/ta.po
new file mode 100644
index 000000000..f9eb1a2af
--- /dev/null
+++ b/gettext-tools/examples/po/ta.po
@@ -0,0 +1,125 @@
+# Tamil messages for GNU gettext.
+# Copyright (C) 2018 Yoyodyne, Inc. (msgids)
+# This file is distributed under the same license as the gettext package.
+# List of contributors follow:
+# Poorajith <gokulkannanst@gmail.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2018-12-10 23:03+0530\n"
+"Last-Translator: Arun Isaac <arunisaac@systemreboot.net>\n"
+"Language-Team: Tamil <tamil@systemreboot.net>\n"
+"Language: ta\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
+msgid "Hello, world!"
+msgstr "வணக்கம், உலகு!"
+
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#, php-format
+msgid "This program is running as process number %d."
+msgstr "இந்நிரல் செயலாக்க எண் %d ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>வணக்கம் உலகு!</big>\n"
+"இந்நிரல் செயலாக்க எண் <b>%d</b> ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>இது மற்றொரு உரை</u></big>\""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>இது மேலும் ஒரு உரை</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "வணக்கம்"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "எடுத்துக்காட்டு நிரல்"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "உரையை மாற்று"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "XML குறிமொழியைப் பயன்படுத்து"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "உரையில் XML குறிமொழியைப் பயன்படுத்துவதா."
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#, ycp-format
+msgid "This program is running as process number %1."
+msgstr "இந்நிரல் செயலாக்க எண் %1 ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-c++-kde/hello.cc:46
+msgid "Hello example"
+msgstr "வணக்கம் எடுத்துக்காட்டு"
+
+#: hello-c++-kde/hello.cc:48
+msgid "Hello world example"
+msgstr "வணக்கம் உலகு எடுத்துக்காட்டு"
+
+#: hello-sh/hello.sh:17
+#, sh-format
+msgid "This program is running as process number $pid."
+msgstr "இந்நிரல் செயலாக்க எண் $pid ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-python/hello.py.in:13
+#, python-format
+msgid "This program is running as process number %(pid)d."
+msgstr "இந்நிரல் செயலாக்க எண் %(pid)d ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
+msgid "This program is running as process number ~D."
+msgstr "இந்நிரல் செயலாக்க எண் ~D ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
+msgid "This program is running as process number {0}."
+msgstr "இந்நிரல் செயலாக்க எண் {0} ஆக இயங்கிக்கொண்டிருக்கிறது."
+
+#: hello-perl/hello-2.pl.in:14
+#, perl-brace-format
+msgid "This program is running as process number {pid}."
+msgstr "இந்நிரல் செயலாக்க எண் {pid} ஆக இயங்கிக்கொண்டிருக்கிறது."
diff --git a/gettext-tools/examples/po/tr.po b/gettext-tools/examples/po/tr.po
index 47fe694ca..7d5efcca4 100644
--- a/gettext-tools/examples/po/tr.po
+++ b/gettext-tools/examples/po/tr.po
@@ -1,50 +1,92 @@
-# Turkish translations for Gnu Gettext Package.
+# Turkish translation for gettext-examples.
+# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2017 Yoyodyne, Inc. (msgids)
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Nilgün Belma Bugüner <nilgun@superonline.com>, 2003,2004
-#
+# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.14-pre1\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2004-01-17 17:57+0100\n"
-"PO-Revision-Date: 2004-01-21 06:17+0300\n"
-"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
+"PO-Revision-Date: 2017-03-26 14:20+0300\n"
+"Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
-
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
-msgstr "Merhaba Dünyalı!"
-
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
-#: hello-php/hello.php:15
+msgstr "Merhaba, Dünya!"
+
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
-msgstr "Bu yazılım, %d süreç kimliği ile çalışıyor."
+msgstr "Bu yazılım, %d işlem numarası ile çalışıyor."
+
+#: hello-c-gnome3/hello.c:79
+#, c-format
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr ""
+"<big>Merhaba dünya!</big>\n"
+"Bu yazılım <b>%d</b> işlem numarası ile çalışıyor."
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr "<big><u>Bu diğer metindir</u></big>"
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr "<big><i>Bu henüz başka bir metindir</i></big>"
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Merhaba"
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr "Örnek uygulama"
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr "Metni güncelleştir"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr "XML betiğini kullan"
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr "XML betiğinde kullanılıp kullanılmayacağını belirtir."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Bu yazılım, %1 süreç kimliği ile çalışıyor."
@@ -57,28 +99,29 @@ msgstr "Hello örneği"
 msgid "Hello world example"
 msgstr "Hello world örneği"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Bu yazılım, $pid süreç kimliği ile çalışıyor."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Bu yazılım, %(pid)d süreç kimliği ile çalışıyor."
 
-#: hello-clisp/hello.lisp.in:14
-#, lisp-format
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Bu yazılım, ~D süreç kimliği ile çalışıyor."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Bu yazılım, {0} süreç kimliği ile çalışıyor."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Bu yazılım, {pid} süreç kimliği ile çalışıyor."
diff --git a/gettext-tools/examples/po/uk.po b/gettext-tools/examples/po/uk.po
index abfd9af8f..f50f628d2 100644
--- a/gettext-tools/examples/po/uk.po
+++ b/gettext-tools/examples/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-23 20:51+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,7 +16,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
 "X-Generator: Lokalize 1.5\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
@@ -24,15 +26,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -42,9 +43,8 @@ msgstr "Привіт, світе!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ця програма виконується як процес з номером %d."
@@ -70,19 +70,19 @@ msgstr "<big><i>Ще якийсь фрагмент тексту</i></big>"
 msgid "Hello"
 msgstr "Привіт"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Програма-приклад"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Оновити текст"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Використати розмітку XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Визначає, чи слід використовувати розмітку XML у тексті."
 
diff --git a/gettext-tools/examples/po/vi.po b/gettext-tools/examples/po/vi.po
index 4f17efc27..62bd5ffae 100644
--- a/gettext-tools/examples/po/vi.po
+++ b/gettext-tools/examples/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-06-30 08:00+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "X-Generator: Gtranslator 2.91.7\n"
@@ -27,15 +28,14 @@ msgstr ""
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -45,9 +45,8 @@ msgstr "Chào thế giới!"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Chương trình này đang chạy với mã số tiến trình %d."
@@ -73,19 +72,19 @@ msgstr "<big><i>Đây là văn bản khác nữa</i></big>"
 msgid "Hello"
 msgstr "Chào"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "Ứng dụng mẫu"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "Văn bản cập nhật"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "Dùng đánh dấu XML"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "Có dùng đánh dấu XML trong văn bản hay không."
 
diff --git a/gettext-tools/examples/po/zh_CN.po b/gettext-tools/examples/po/zh_CN.po
index a79d2f3c4..a5ca03693 100644
--- a/gettext-tools/examples/po/zh_CN.po
+++ b/gettext-tools/examples/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-09-01 09:53中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,9 +40,8 @@ msgstr "世界你好！"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "此程序正以进程号 %d 运行。"
@@ -68,19 +67,19 @@ msgstr "<big><i>这还是另一段文本</i></big>"
 msgid "Hello"
 msgstr "世界你好"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "示例应用"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "更新文本"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "使用XML 标记语言"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "是否在文本中使用XML 标记"
 
diff --git a/gettext-tools/examples/po/zh_HK.po b/gettext-tools/examples/po/zh_HK.po
index d92ea40a4..764466ac0 100644
--- a/gettext-tools/examples/po/zh_HK.po
+++ b/gettext-tools/examples/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2006-07-05 15:40+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -14,37 +14,74 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "你好！"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行中，進程編號為 %d。"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.c:79
+#, fuzzy, c-format
+#| msgid "This program is running as process number %d."
+msgid ""
+"<big>Hello world!</big>\n"
+"This program is running as process number <b>%d</b>."
+msgstr "本程式正在執行中，進程編號為 %d。"
+
+#: hello-c-gnome3/hello.c:84
+msgid "<big><u>This is another text</u></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.c:86
+msgid "<big><i>This is yet another text</i></big>"
+msgstr ""
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:6
+msgid "Example Application"
+msgstr ""
+
+#: hello-c-gnome3/hello.ui:34
+msgid "Update text"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Use XML markup"
+msgstr ""
+
+#: hello-c-gnome3/hello.gschema.xml:9
+msgid "Whether to use XML markup in the text."
+msgstr ""
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "本程式正在執行中，進程編號為 %1。"
@@ -57,29 +94,29 @@ msgstr "測試範例"
 msgid "Hello world example"
 msgstr "訊息測試範例"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "本程式正在執行中，進程編號為 $pid。"
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "本程式正在執行中，進程編號為 %(pid)d。"
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "本程式正在執行中，進程編號為 ~D。"
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "本程式正在執行中，進程編號為 {0}。"
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "本程式正在執行中，進程編號為 {pid}。"
diff --git a/gettext-tools/examples/po/zh_TW.po b/gettext-tools/examples/po/zh_TW.po
index 08bbd0e52..75f12e1d4 100644
--- a/gettext-tools/examples/po/zh_TW.po
+++ b/gettext-tools/examples/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:20+0900\n"
+"POT-Creation-Date: 2019-04-07 16:07+0200\n"
 "PO-Revision-Date: 2015-10-08 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
 #: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
 #: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
-#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
-#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
-#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
-#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
-#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
-#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
-#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
-#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -40,9 +40,8 @@ msgstr "哈囉，大家好！"
 #: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
 #: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
 #: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
-#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
-#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行，行程編號為 %d。"
@@ -68,19 +67,19 @@ msgstr "<big><i>這又是另一段文字</i></big>"
 msgid "Hello"
 msgstr "哈囉"
 
-#: hello-c-gnome3/hello.ui:5
+#: hello-c-gnome3/hello.ui:6
 msgid "Example Application"
 msgstr "應用軟體範例"
 
-#: hello-c-gnome3/hello.ui:33
+#: hello-c-gnome3/hello.ui:34
 msgid "Update text"
 msgstr "更新文字"
 
-#: hello-c-gnome3/hello.gschema.xml:7
+#: hello-c-gnome3/hello.gschema.xml:8
 msgid "Use XML markup"
 msgstr "使用 XML 標記"
 
-#: hello-c-gnome3/hello.gschema.xml:8
+#: hello-c-gnome3/hello.gschema.xml:9
 msgid "Whether to use XML markup in the text."
 msgstr "是否在文字中使用 XML 標記"
 
diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index 324730caa..2578744fb 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
-"POT-Creation-Date: 2002-08-06 16:01+0200\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -13,339 +14,1004 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: lib/argmatch.c:134
-#, c-format
-msgid "invalid argument `%s' for `%s'"
+"X-Bugs: Report translation errors to the Language-Team address.\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:134
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid argument %s for %s"
 msgstr "нерэчаісны аргумэнт `%s' для `%s'"
 
-#: lib/argmatch.c:135
-#, c-format
-msgid "ambiguous argument `%s' for `%s'"
+#: gnulib-lib/argmatch.c:135
+#, fuzzy, c-format
+#| msgid "ambiguous argument `%s' for `%s'"
+msgid "ambiguous argument %s for %s"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргумэнты:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267
-#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
+#: gnulib-lib/clean-temp.c:325
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "памылка ў час чытаньня файла \"%s\""
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: lib/copy-file.c:68
+#: gnulib-lib/clean-temp.c:339
 #, c-format
-msgid "cannot open backup file \"%s\" for writing"
-msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr ""
+"немагчыма стварыць часовую дырэкторыю,\n"
+"выкарыстоўвываючы ўзор \"%s\""
 
-#: lib/copy-file.c:81 src/urlget.c:216
+#: gnulib-lib/clean-temp.c:435
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot remove temporary file %s"
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#: gnulib-lib/clean-temp.c:450
+#, fuzzy, c-format
+#| msgid "cannot create a temporary directory using template \"%s\""
+msgid "cannot remove temporary directory %s"
+msgstr ""
+"немагчыма стварыць часовую дырэкторыю,\n"
+"выкарыстоўвываючы ўзор \"%s\""
+
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr ""
+
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error reading \"%s\""
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
+msgstr "памылка ў час чытаньня файла \"%s\""
+
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
+msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
+
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "памылка чытаньня \"%s\""
 
-#: lib/copy-file.c:87 lib/copy-file.c:91
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "памылка запісу файла \"%s\""
 
-#: lib/copy-file.c:93 src/urlget.c:226
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "памылка пасля чытаньня \"%s\""
 
-#: lib/error.c:116
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() памылка"
+
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgid "C# compiler not found, try installing mono"
+msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
+
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgid "C# virtual machine not found, try installing mono"
+msgstr ""
+"Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
+
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
-#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
-#: lib/wait-process.c:132
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s падпрацэс спынены з-за памылкі"
 
-#: lib/getopt.c:691
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: lib/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: выбар `%s' неадназначны\n"
 
-#: lib/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: нераспазнаны выбар `%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: lib/getopt.c:739 lib/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: lib/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: нераспазнаны выбар `--%s'\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: lib/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: нераспазнаны выбар `%c%s'\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: lib/getopt.c:798
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: несапраўдны выбар -- %c\n"
+msgid "invalid source_version argument to compile_java_class"
+msgstr ""
 
-#: lib/getopt.c:801
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: нерэчаісны выбар -- %c\n"
+msgid "invalid target_version argument to compile_java_class"
+msgstr ""
 
-#: lib/getopt.c:831 lib/getopt.c:961
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
+msgid "failed to create \"%s\""
+msgstr "немагчыма стварыць \"%s\""
 
-#: lib/getopt.c:878
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначны\n"
+msgid "error while writing \"%s\" file"
+msgstr "памылка ў час запісу файла \"%s\""
 
-#: lib/getopt.c:896
+#: gnulib-lib/javacomp.c:2436
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
-
-#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: lib/javaexec.c:414
+#: gnulib-lib/javaexec.c:417
+#, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
+msgstr ""
+"Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97
-#: src/po-lex.c:130
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "падпрацэс %s, памылка ўводу-вываду"
+
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#, c-format
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
 
-#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
-#: lib/pipe-out.c:135
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "памылка запісу ў падпрацэс %s"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "памылка чытаньня з падпрацэса %s"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#.
+#. If you don't know what to put here, please see
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: gnulib-lib/quotearg.c:362
+msgid "`"
+msgstr ""
+
+#: gnulib-lib/quotearg.c:363
+msgid "'"
+msgstr ""
+
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
 msgid "cannot create pipe"
 msgstr "не магчыма стварыць канвеэр"
 
-#: lib/wait-process.c:110
+#: gnulib-lib/w32spawn.h:49
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr ""
+
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s падпрацэс"
 
-#: lib/wait-process.c:124
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/format-c.c:760 src/format-python.c:506
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
-msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
-#: src/format-pascal.c:443 src/format-python.c:520
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
+msgid "The root element must be <%s>"
+msgstr ""
 
-#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
-#: src/format-ycp.c:145
+#: src/cldr-plurals.c:82
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
+"і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Informative output:\n"
+#| "  -h, --help                  display this help and exit\n"
+#| "  -V, --version               output version information and exit\n"
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+"Інфармацыйны вывад:\n"
+"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
+"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Аўтар %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr ""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+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-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
-#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
-#: src/format-ycp.c:144
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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-java.c:660
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
+
+#: src/format-boost.c:449
+#, c-format
+msgid "The directive number %u starts with | but does not end with |."
+msgstr ""
+
+#: src/format.c:152
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
+
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+
+#: src/format-c.c:39
+#, c-format
+msgid "In the directive number %u, the token after '<' is not followed by '>'."
+msgstr ""
+
+#: src/format-c.c:42 src/format-gfc-internal.c:289
+#, c-format
+msgid "The string refers to argument number %u but ignores argument number %u."
+msgstr ""
+
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, 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' і '%s' не супадае"
+
+#: src/format-csharp.c:85 src/format-java.c:205
+#, c-format
+msgid "In the directive number %u, '{' is not followed by an argument number."
+msgstr ""
+
+#: src/format-csharp.c:106
+#, c-format
+msgid "In the directive number %u, ',' is not followed by a number."
+msgstr ""
+
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+
+#: src/format-csharp.c:136
+#, c-format
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+
+#: src/format-csharp.c:137
+#, c-format
+msgid "The directive number %u ends with an invalid character instead of '}'."
+msgstr ""
+
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+
+#: src/format-csharp.c:159
+#, c-format
+msgid "The string contains a lone '}' after directive number %u."
+msgstr ""
+
+#: 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:292
+#, c-format
+msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgstr ""
+
+#: 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:398
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: 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:463
+#, c-format
+msgid "In the directive number %u, flags are not allowed before '%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:677
+#, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr ""
+
+#: src/format-gcc-internal.c:680
+#, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr ""
+
+#: src/format-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr ""
+
+#: src/format-invalid.h:22
+msgid "The string ends in the middle of a directive."
+msgstr ""
+
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+
+#: src/format-invalid.h:28
+#, c-format
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+
+#: src/format-invalid.h:30
+#, c-format
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+
+#: src/format-invalid.h:32
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+
+#: src/format-invalid.h:36
+#, c-format
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+
+#: src/format-invalid.h:37
+#, c-format
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+
+#: src/format-invalid.h:40
+#, c-format
+msgid "The string refers to argument number %u in incompatible ways."
+msgstr ""
+
+#: src/format-java.c:240
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
+#, c-format
+msgid "In the directive number %u, \"%s\" is not followed by a comma."
+msgstr ""
+
+#: src/format-java.c:274
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+
+#: src/format-java.c:323
+#, c-format
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+
+#: src/format-java.c:572
+#, c-format
+msgid "In the directive number %u, a choice contains no number."
+msgstr ""
+
+#: src/format-java.c:583
+#, c-format
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+
+#: src/format-java.c:745
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/format-java.c:675
+#: 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:700
+#: src/format-java.c:776
+#, 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 ""
+"спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
+
+#: src/format-kde.c:158
 #, c-format
-msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
 
-#: src/format-lisp.c:3381
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "памылка ў час чытаньня \"%s\""
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
 
-#: src/format-lisp.c:3402
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
+msgid ""
+"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."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/format-python.c:397
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
-msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
+msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-python.c:409
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
-msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-python.c:437
+#: src/format-lisp.c:2808
+msgid "The string ends in the middle of a ~/.../ directive."
+msgstr ""
+
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
+#, c-format
+msgid "Found '~%c' without matching '~%c'."
+msgstr ""
+
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
+#, c-format
+msgid "In the directive number %u, both the @ and the : modifiers are given."
+msgstr ""
+
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
-msgstr "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
 
-#: src/format-python.c:452
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
+#, c-format
+msgid "In the directive number %u, '~;' is used in an invalid position."
+msgstr ""
+
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
+msgid "The string refers to some argument in incompatible ways."
+msgstr ""
+
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, 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' і '%s' нераўназначныя"
+
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, 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 ""
+"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
+
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:478
+#: src/format-perl.c:433
 #, c-format
-msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
-msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
 
-#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
-#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
-#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
-#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378
-#, c-format, no-wrap
+#: src/format-python-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:193
+#, c-format
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-"пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-"магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
 
-#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
-#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
-#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
-#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
-#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383
+#: src/format-python-brace.c:278
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Аўтар %s.\n"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
 
-#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
-msgid "too many arguments"
-msgstr "вельмі шмат аргумэнтаў"
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
 
-#: src/gettext.c:168 src/ngettext.c:155
-msgid "missing arguments"
-msgstr "прапушчаны аргумэнты"
+#: src/format-python.c:354
+#, c-format
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr ""
+
+#: src/format-python.c:430
+#, fuzzy, c-format
+#| msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
+
+#: src/format-python.c:437
+#, fuzzy, c-format
+#| msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
-#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
-#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
-#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
+#: 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'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
+
+#: src/format-python.c:494
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#| "same"
+msgid ""
+"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 "Try `%s --help' for more information.\n"
-msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
 
-#: src/gettext.c:245
-#, c-format, no-wrap
+#: src/format-sh.c:79
+msgid "The string refers to a shell variable with a non-ASCII name."
+msgstr ""
+
+#: src/format-sh.c:81
 msgid ""
-"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-"or:    %s [OPTION] -s [MSGID]...\n"
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
 msgstr ""
-"Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
-"        ці:    %s [ВЫБАР] -s [MSGID]...\n"
 
-#: src/gettext.c:251
-#, no-wrap
-msgid "Display native language translation of a textual message.\n"
-msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
 
-#: src/gettext.c:255
-#, no-wrap
+#: src/format-sh.c:85
+msgid "The string refers to a shell variable with an empty name."
+msgstr ""
+
+#: src/format-ycp.c:90
+#, c-format
 msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
-msgstr ""
-"  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з TEXTDOMAIN\n"
-"  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
-"  -E                        (ігнаруецца для сумяшчальнасьці)\n"
-"  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
-"  -n                        стрымлівае цягнучыеся новыя радкі\n"
-"  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
-"  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
-"                            MSGID з TEXTDOMAIN\n"
-
-#: src/gettext.c:266
-#, c-format, no-wrap
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+
+#: src/format-ycp.c:91
+#, c-format
 msgid ""
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
-"Standard search directory: %s\n"
-msgstr ""
-"Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
-"асяроддзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
-"дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-"асяроддзя TEXTDOMAINDIR.\n"
-"Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
-"каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
-"замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n"
-"Стандартная дырэкторыя для пошуку: %s\n"
-
-#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
-#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
-#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
+msgid "Bruno Haible"
+msgstr ""
+
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
+#, c-format
+msgid "too many arguments"
+msgstr "вельмі шмат аргумэнтаў"
 
-#: src/hostname.c:209 src/msginit.c:352
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/hostname.c:214
-#, no-wrap
+#: src/hostname.c:216
+#, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Друкуе назву вузла.\n"
 
 #: src/hostname.c:219
-#, no-wrap
+#, c-format
+msgid "Output format:\n"
+msgstr ""
+
+#: src/hostname.c:221
+#, c-format
+msgid "  -s, --short                 short host name\n"
+msgstr ""
+
+#: src/hostname.c:223
+#, fuzzy, c-format
+#| msgid ""
+#| "Output format:\n"
+#| "  -s, --short           short host name\n"
+#| "  -f, --fqdn, --long    long host name, includes fully qualified domain "
+#| "name,\n"
+#| "                          and aliases\n"
+#| "  -i, --ip-address      addresses for the hostname\n"
 msgid ""
-"Output format:\n"
-"  -s, --short           short host name\n"
-"  -f, --fqdn, --long    long host name, includes fully qualified domain name,\n"
-"                          and aliases\n"
-"  -i, --ip-address      addresses for the hostname\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
+"                                name, and aliases\n"
 msgstr ""
 "Фармат вываду:\n"
 "  -s, --short           кароткая назва вузла\n"
@@ -353,46 +1019,109 @@ msgstr ""
 "                        назву маёнтка й прозьвішчы\n"
 "  -i, --ip-address      адрас для вузла\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
-#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
-#: src/msginit.c:394 src/urlget.c:180
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
+#: src/hostname.c:226
+#, c-format
+msgid "  -i, --ip-address            addresses for the hostname\n"
+msgstr ""
+
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
+#, c-format, no-wrap
+msgid "Informative output:\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
 
-#: src/hostname.c:249 src/hostname.c:256
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199
-#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "неабходна задаць не менш двух файлаў"
+
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "не магчыма стварыць канвеэр"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "нерэчаісны аргумэнт `%s' для `%s'"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "не магчыма стварыць канвеэр"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#, c-format
 msgid "at most one input file allowed"
 msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
 
-#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253
-#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218
-#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317
-#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325
-#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393
-#: src/xgettext.c:397
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
-#, c-format, no-wrap
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:337
-#, no-wrap
+#: src/msgattrib.c:426
+#, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
@@ -400,34 +1129,79 @@ msgstr ""
 "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
-#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
-#: src/msgunfmt.c:329 src/msguniq.c:296
-#, no-wrap
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
+#, c-format
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
+
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
+#, fuzzy, c-format
+#| msgid "no input file given"
+msgid "Input file location:\n"
+msgstr "невызначан уваходзячы файл"
 
-#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
-#, no-wrap
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#, c-format
+msgid "  INPUTFILE                   input PO file\n"
+msgstr ""
+
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
+#, c-format
 msgid ""
-"Input file location:\n"
-"  INPUTFILE                   input PO file\n"
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If no input file is given or if it is -, standard input is read.\n"
+msgstr ""
+
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#, fuzzy, c-format
+#| msgid ""
+#| "Input file location:\n"
+#| "  FILE ...                 input .mo files\n"
+#| "If no input file is given or if it is -, standard input is read.\n"
+msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Файл уводу:\n"
-"  INPUTFILE                   уваходзячы PO файл\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                              файлаў\n"
+"  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
-#: src/msggrep.c:431 src/msgmerge.c:430
-#, no-wrap
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
+#, c-format
+msgid "Output file location:\n"
+msgstr ""
+
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified file\n"
+msgstr ""
+
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
+#, fuzzy, c-format
+#| msgid ""
+#| "Output file location:\n"
+#| "  -o, --output-file=FILE      write output to specified file\n"
+#| "The results are written to standard output if no output file is "
+#| "specified\n"
+#| "or if it is -.\n"
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified file\n"
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
@@ -436,91 +1210,276 @@ msgstr ""
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:364
-#, no-wrap
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
+#, c-format
+msgid "Message selection:\n"
+msgstr ""
+
+#: src/msgattrib.c:452
+#, c-format
 msgid ""
-"Message selection:\n"
 "      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+
+#: src/msgattrib.c:454
+#, c-format
+msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
-"      --no-fuzzy              remove 'fuzzy' marked messages\n"
-"      --only-fuzzy            keep 'fuzzy' marked messages\n"
-"      --no-obsolete           remove obsolete #~ messages\n"
-"      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
-"Выбар паведамленьня:\n"
-"      --translated            пакідае перакладзеныя, прымае неперакладзеныя\n"
-"                              паведамленьні\n"
-"      --untranslated          пакідае неперакладзеныя, прымае перакладзеныя\n"
-"                              паведамленьні\n"
-"      --no-fuzzy              прымае паведамленьні, азначаныя як 'fuzzy'\n"
-"      --only-fuzzy            пакідае паведамленьні, азначаныя як 'fuzzy'\n"
-"      --no-obsolete           прымае састарэлыя #~ паведамленьні\n"
-"      --only-obsolete         пакіде састарэлыя #~ паведамленьні\n"
-
-#: src/msgattrib.c:375
-#, no-wrap
+
+#: src/msgattrib.c:456
+#, c-format
+msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgstr ""
+
+#: src/msgattrib.c:458
+#, c-format
+msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+msgstr ""
+
+#: src/msgattrib.c:460
+#, c-format
+msgid "      --no-obsolete           remove obsolete #~ messages\n"
+msgstr ""
+
+#: src/msgattrib.c:462
+#, c-format
+msgid "      --only-obsolete         keep obsolete #~ messages\n"
+msgstr ""
+
+#: src/msgattrib.c:465
+#, c-format
+msgid "Attribute manipulation:\n"
+msgstr ""
+
+#: src/msgattrib.c:467
+#, c-format
+msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
+msgstr ""
+
+#: src/msgattrib.c:469
+#, c-format
+msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+msgstr ""
+
+#: src/msgattrib.c:471
+#, c-format
+msgid "      --set-obsolete          set all messages obsolete\n"
+msgstr ""
+
+#: src/msgattrib.c:473
+#, c-format
+msgid "      --clear-obsolete        set all messages non-obsolete\n"
+msgstr ""
+
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
+#, c-format
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+
+#: src/msgattrib.c:484
+#, c-format
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+
+#: src/msgattrib.c:486
+#, c-format
+msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+
+#: src/msgattrib.c:488
+#, c-format
 msgid ""
-"Attribute manipulation:\n"
-"      --set-fuzzy             set all messages 'fuzzy'\n"
-"      --clear-fuzzy           set all messages non-'fuzzy'\n"
-"      --set-obsolete          set all messages obsolete\n"
-"      --clear-obsolete        set all messages non-obsolete\n"
-"      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"Узьдзеяньне на атрыбуты:\n"
-"      --set-fuzzy             усталёўвае ўсе паведамленьні як 'fuzzy'\n"
-"      --clear-fuzzy           усталёўвае ўсе паведамленьні як не 'fuzzy'\n"
-"      --set-obsolete          усталёўвае ўсе паведамленьні як састарэлыя\n"
-"      --clear-obsolete        усталёўвае ўсе паведамленьні як несастарэлыя\n"
-"      --fuzzy                 тое, што й --only-fuzzy --clear-fuzzy\n"
-"      --obsolete              тое, што й --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:386
-#, no-wrap
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
+#, c-format
+msgid "Input file syntax:\n"
+msgstr ""
+
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
+#, c-format
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
+#, c-format
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
+#, c-format
+msgid "Output details:\n"
+msgstr ""
+
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
+#, c-format
 msgid ""
-"Output details:\n"
 "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
+#, c-format
+msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -i, --indent                write the .po file using indented style\n"
-"      --no-location           do not write '#: filename:line' lines\n"
+msgstr ""
+
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
+#, c-format
+msgid "      --force-po              write PO file even if empty\n"
+msgstr ""
+
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
+#, c-format
+msgid "  -i, --indent                write the .po file using indented style\n"
+msgstr ""
+
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
+#, c-format
+msgid "      --no-location           do not write '#: filename:line' lines\n"
+msgstr ""
+
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
+#, c-format
+msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
+#, c-format
+msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER          set output page width\n"
+msgstr ""
+
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
+#, c-format
+msgid "  -p, --properties-output     write out a Java .properties file\n"
+msgstr ""
+
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
+#, c-format
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
+#, c-format
+msgid "  -w, --width=NUMBER          set output page width\n"
+msgstr ""
+
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
+#, c-format
+msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе;\n"
-"                              без дадатковых сімвалаў\n"
-"      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-"                              пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgcat.c:259 src/msgcomm.c:282
+msgstr ""
+
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
+#, c-format
+msgid "  -s, --sort-output           generate sorted output\n"
+msgstr ""
+
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
+#, c-format
+msgid "  -F, --sort-by-file          sort output by file location\n"
+msgstr ""
+
+#: 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:300 src/msgcomm.c:316 src/xgettext.c:542
-#, c-format, no-wrap
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
+#, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:305
-#, no-wrap
+#: src/msgcat.c:371
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Concatenates and merges the specified PO files.\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be cumulated, except that if --use-first\n"
+#| "is specified, they will be taken from the first PO file to define them.\n"
+#| "File positions from all PO files will be cumulated.\n"
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -528,9 +1487,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "Злучае й аб'ядноўвае зададзеныя PO-файлы.\n"
 "Шукае паведамленьніе якія вызначаны ў двух ці больш PO-файлах.\n"
@@ -543,118 +1502,98 @@ msgstr ""
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
-#, no-wrap
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
+#, c-format
+msgid "  INPUTFILE ...               input files\n"
+msgstr ""
+
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
+#, c-format
+msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgstr ""
+
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
+#, c-format
+msgid "If input file is -, standard input is read.\n"
+msgstr ""
+
+#: src/msgcat.c:407 src/msgcomm.c:398
+#, c-format
 msgid ""
-"Input file location:\n"
-"  INPUTFILE ...                  input files\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
+"  -<, --less-than=NUMBER      print messages with less than this many\n"
+"                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"Файл уводу:\n"
-"  УВАХОДЗЯЧЫ_ФАЙЛ ...            уваходзячыя файлы\n"
-"  -f, --files-from=ФАЙЛ          атрымліваць сьпіс уваходзячый файлаў з ФАЙЛА\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ     дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                                 файлаў\n"
-"Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
 
-#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309
-#, no-wrap
+#: src/msgcat.c:410
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE         write output to specified file\n"
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
+"  ->, --more-than=NUMBER      print messages with more than this many\n"
+"                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"Файл вываду:\n"
-"  -o, --output-file=ФАЙЛ         запісваць вывад у азначаны файл\n"
-"Вынікі запісваюцца ў стандартны вывад, калі імя файла не зададзена, ці\n"
-"замест яго -.\n"
 
-#: src/msgcat.c:340
-#, no-wrap
+#: src/msgcat.c:413 src/msgcomm.c:404
+#, c-format
 msgid ""
-"Message selection:\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 0 if not set\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-"Выбар паведамленьняў:\n"
-"  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
-"                                 вызначэньняў, чым зададзена; звычайна не\n"
-"                                 абмежавана\n"
-"  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
-"                                 вызначэньняў, чым зададзена; звычайна 0\n"
-"  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-"                                 непаўторныя паведамленьні будуць надрукаваны\n"
-
-#: src/msgcat.c:352 src/msguniq.c:324
-#, no-wrap
+"  -u, --unique                shorthand for --less-than=2, requests\n"
+"                              that only unique messages be printed\n"
+msgstr ""
+
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
+#, c-format
 msgid ""
-"Output details:\n"
-"  -t, --to-code=NAME             encoding for output\n"
-"      --use-first                use first available translation for each\n"
-"                                 message, don't merge several translations\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape                не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць ESC пасьлядоўнасьці ў вывадзе,\n"
-"                                 без дадатковых сімвалаў\n"
-"      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                                 выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
-#, no-wrap
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
+#, c-format
 msgid ""
-"Informative output:\n"
-"  -h, --help                     display this help and exit\n"
-"  -V, --version                  output version information and exit\n"
+"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
+"                              syntax\n"
+msgstr ""
+
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
+#, c-format
+msgid "  -t, --to-code=NAME          encoding for output\n"
+msgstr ""
+
+#: src/msgcat.c:429 src/msguniq.c:380
+#, 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:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                     адлюстроўвае гэту дапамогу і выходзіць\n"
-"  -V, --version                  выводзіць зьвесткі аб версіі і выходзіць\n"
 
-#: src/msgcmp.c:149 src/msgmerge.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
+msgid "Peter Miller"
+msgstr ""
+
+#: src/msgcmp.c:188 src/msgmerge.c:389
+#, c-format
 msgid "no input files given"
 msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:154 src/msgmerge.c:291
+#: src/msgcmp.c:193 src/msgmerge.c:394
+#, c-format
 msgid "exactly 2 input files required"
 msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgcmp.c:175 src/msgmerge.c:390
-#, c-format, no-wrap
+#: src/msgcmp.c:212 src/msgmerge.c:540
+#, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
 
-#: src/msgcmp.c:180
-#, no-wrap
+#: src/msgcmp.c:217
+#, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -671,46 +1610,82 @@ msgstr ""
 "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
 "лепшай праверкі.\n"
 
-#: src/msgcmp.c:195
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  def.po                      translations\n"
-"  ref.pot                     references to the sources\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#: src/msgcmp.c:231
+#, c-format
+msgid "  def.po                      translations\n"
 msgstr ""
-"Файл уводу:\n"
-"  def.po                      пераклады\n"
-"  ref.pot                     спасылкі на крыніцы\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку файлаў ўводу\n"
 
-#: src/msgcmp.c:203 src/msgmerge.c:454
-#, no-wrap
+#: src/msgcmp.c:233
+#, c-format
+msgid "  ref.pot                     references to the sources\n"
+msgstr ""
+
+#: src/msgcmp.c:238 src/msgmerge.c:606
+#, c-format
+msgid "Operation modifiers:\n"
+msgstr ""
+
+#: src/msgcmp.c:240 src/msgmerge.c:608
+#, fuzzy, c-format
+#| msgid ""
+#| "Operation modifiers:\n"
+#| "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#| "po\n"
 msgid ""
-"Operation modifiers:\n"
-"  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr ""
 "Зьмяняльнікі:\n"
-"  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def.po\n"
+"  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def."
+"po\n"
+
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
 
-#: src/msgcmp.c:252 src/msgmerge.c:855
+#: src/msgcmp.c:244
+#, c-format
+msgid "      --use-fuzzy             consider fuzzy entries\n"
+msgstr ""
+
+#: src/msgcmp.c:246
+#, c-format
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr ""
+
+#: src/msgcmp.c:324
+#, fuzzy, c-format
+#| msgid "warning: this message is not used"
+msgid "this message is untranslated"
+msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
+
+#: src/msgcmp.c:330
+#, c-format
+msgid "this message needs to be reviewed by the translator"
+msgstr ""
+
+#: src/msgcmp.c:369 src/msgmerge.c:1576
+#, c-format
 msgid "this message is used but not defined..."
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
 
-#: src/msgcmp.c:254 src/msgmerge.c:857
+#: src/msgcmp.c:372 src/msgmerge.c:1579
+#, c-format
 msgid "...but this definition is similar"
 msgstr "...але гэта вызначэньне падобна"
 
-#: src/msgcmp.c:259 src/msgmerge.c:884
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:546
+#, c-format
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:338 src/po-lex.c:701
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -718,27 +1693,29 @@ msgstr[0] "знойдзена %d фатальная памылка"
 msgstr[1] "знойдзена %d фатальныя памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
-msgid "duplicate message definition"
-msgstr "двайное вызначэньне паведамленьня"
-
-#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
-msgid "...this is the location of the first definition"
-msgstr "...гэта месцазнаходжаньне першага вызначэньня"
-
-#: src/msgcomm.c:271
+#: src/msgcomm.c:315
+#, c-format
 msgid "at least two files must be specified"
 msgstr "неабходна задаць не менш двух файлаў"
 
-#: src/msgcomm.c:321
-#, no-wrap
+#: 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"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "cumulated.\n"
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -751,163 +1728,116 @@ msgstr ""
 "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
 "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
 
-#: src/msgcomm.c:355
-#, no-wrap
+#: src/msgcomm.c:401
+#, c-format
 msgid ""
-"Message selection:\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 1 if not set\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-"Выбар паведамленьняў:\n"
-"  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
-"                                 вызначэньняў, чым зададзена; звычайна не\n"
-"                                 абмежавана\n"
-"  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
-"                                 вызначэньняў, чым зададзена; звычайна 1\n"
-"  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
-"                                 непаўторныя паведамленьні будуць надрукаваны\n"
-
-#: src/msgcomm.c:367
-#, no-wrap
+"  ->, --more-than=NUMBER      print messages with more than this many\n"
+"                              definitions, defaults to 1 if not set\n"
+msgstr ""
+
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, c-format
 msgid ""
-"Output details:\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-msgstr ""
-"Падрабязнасьці вываду:n  -e, --no-escape                не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                                 вывадзе замест дадатковых сымбаляў\n"
-"      --force-po                 запісваць PO файл, нават калі ён парожні\n"
-"  -i, --indent                   запісваць .po f файл з водступамі\n"
-"      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі\n"
-"                                 (гэты выбар выкарыстоўваецца неабумоўленым)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
-"      --no-wrap                  не разьбіваць радкі доўгіх паведамленьняў,\n"
-"                                 даўжэйшыя за шырыню старонкі вываду, на\n"
-"                                 некалькі радкоў\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкоўваць вывад па шляху да файлу\n"
-"      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
-
-#: src/msgconv.c:258
-#, no-wrap
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+
+#: src/msgconv.c:311
+#, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
 
-#: src/msgconv.c:284
-#, no-wrap
-msgid ""
-"Conversion target:\n"
-"  -t, --to-code=NAME          encoding for output\n"
-"The default encoding is the current locale's encoding.\n"
+#: src/msgconv.c:335
+#, fuzzy, c-format
+#| msgid "conversion failure"
+msgid "Conversion target:\n"
+msgstr "памылка пераўтварэньня"
+
+#: src/msgconv.c:339
+#, fuzzy, c-format
+#| msgid ""
+#| "Conversion target:\n"
+#| "  -t, --to-code=NAME          encoding for output\n"
+#| "The default encoding is the current locale's encoding.\n"
+msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Мэта пераўтварэньня:\n"
 "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
 "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
 
-#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
-#, no-wrap
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
+#, c-format
+msgid "  -i, --indent                indented output style\n"
+msgstr ""
+
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
+#, c-format
+msgid "      --no-location           suppress '#: filename:line' lines\n"
+msgstr ""
+
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, c-format
 msgid ""
-"Output details:\n"
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -i, --indent                indented output style\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
-"                              без дадатковых сімвалаў\n"
-"      --force-po              запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
-"  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
-"                              выбар выкарыстоўваецца паўмаўчаньню)\n"
-"      --strict                запісваць .po файл, жорстка адпавядаючы\n"
-"                              пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
-
-#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
+#, c-format
+msgid "      --strict                strict Uniforum output style\n"
+msgstr ""
+
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
+#, c-format
 msgid "no input file given"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgen.c:197
+#: src/msgen.c:263
+#, c-format
 msgid "exactly one input file required"
 msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgen.c:237
-#, c-format, no-wrap
+#: src/msgen.c:304
+#, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
 
-#: src/msgen.c:242
-#, no-wrap
+#: src/msgen.c:309
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Creates an English translation catalog.  The input file is the last\n"
+#| "created English PO file, or a PO Template file (generally created by\n"
+#| "xgettext).  Untranslated entries are assigned a translation that is\n"
+#| "identical to the msgid, and are marked fuzzy.\n"
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
 "created English PO file, or a PO Template file (generally created by\n"
 "xgettext).  Untranslated entries are assigned a translation that is\n"
-"identical to the msgid, and are marked fuzzy.\n"
+"identical to the msgid.\n"
 msgstr ""
 "Стварае каталёг ангельскіх перакладаў.  Файл уводу - гэта апошні створаны\n"
 "ангельскі PO файл, ці шаблён PO файлу (звычайна створаны xgettext).\n"
 "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
 "пазначаюцца як недакладныя (fuzzy).\n"
 
-#: src/msgen.c:255
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  INPUTFILE                   input PO or POT file\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
+#: src/msgen.c:321
+#, c-format
+msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
-"Уваходзячы файл:\n"
-"  INPUTFILE                   уваходзячы PO ці POT файл\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
-"Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
 
-#: src/msgexec.c:180
+#: src/msgexec.c:201
+#, c-format
 msgid "missing command name"
 msgstr "прапушчана назва каманды"
 
-#: src/msgexec.c:228
-#, c-format, no-wrap
+#: src/msgexec.c:262
+#, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
 
-#: src/msgexec.c:233
-#, no-wrap
+#: src/msgexec.c:267
+#, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
 "The COMMAND can be any program that reads a translation from standard\n"
@@ -920,8 +1850,8 @@ msgstr ""
 "адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
 "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
 
-#: src/msgexec.c:242
-#, no-wrap
+#: src/msgexec.c:276
+#, 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"
@@ -929,153 +1859,192 @@ msgstr ""
 "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
 "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgexec.c:253 src/msgfilter.c:371
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  -i, --input=INPUTFILE       input PO file\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If no input file is given or if it is -, standard input is read.\n"
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "стандартны ўвод"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
-"Уваходзячы файл:\n"
-"  -i, --input=INPUTFILE       PO файл уводу\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
-"Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n"
 
-#: src/msgexec.c:313
+#: src/msgexec.c:291 src/msgfilter.c:426
+#, c-format
+msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgstr ""
+
+#: src/msgexec.c:355
+#, c-format
 msgid "write to stdout failed"
 msgstr "памылка запісу ў stdout"
 
-#: src/msgexec.c:337 src/msgfilter.c:610
+#: src/msgfilter.c:304
 #, c-format
-msgid "write to %s subprocess failed"
-msgstr "памылка запісу ў падпрацэс %s"
-
-#: src/msgfilter.c:268
 msgid "missing filter name"
 msgstr "прапушчана назва фільтра"
 
-#: src/msgfilter.c:292
+#: src/msgfilter.c:324
+#, c-format
 msgid "at least one sed script must be specified"
 msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfilter.c:356
-#, c-format, no-wrap
+#: src/msgfilter.c:413
+#, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfilter.c:361
-#, no-wrap
+#: src/msgfilter.c:417
+#, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfilter.c:387
-#, no-wrap
+#: src/msgfilter.c:441
+#, 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 ""
-"ФІЛЬТРАМ можа быць любая праграма, якая чытае пераклады са стандартнага ўводу\n"
+"ФІЛЬТРАМ можа быць любая праграма, якая чытае пераклады са стандартнага "
+"ўводу\n"
 "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfilter.c:393
-#, no-wrap
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
+#, c-format
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+msgstr ""
+
+#: src/msgfilter.c:454
+#, c-format
 msgid ""
-"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+msgstr ""
+
+#: src/msgfilter.c:456
+#, c-format
+msgid ""
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
+msgstr ""
+
+#: src/msgfilter.c:459
+#, c-format
+msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"Карысныя ВЫБАРы-ФІЛЬТАРУ, калі ФІЛЬТАР гэта 'sed':\n"
-"  -e, --expression=SCRIPT     дадае SCRIPT да загадаў, якія будуць выкананы\n"
-"  -f, --file=SCRIPTFILE       дадае зьмест SCRIPTFILE да загадаў, якія будуць\n"
-"                              выкананы\n"
-"  -n, --quiet, --silent       выключаць аўтаматычны друк прыклада\n"
 
-#: src/msgfilter.c:402
-#, no-wrap
+#: src/msgfilter.c:477 src/msggrep.c:600
+#, c-format
 msgid ""
-"Output details:\n"
 "      --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"      --indent                indented output style\n"
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"  -s, --sort-output           generate sorted output\n"
-"  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"Дэталі вываду:\n"
-"      --no-escape             не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                              вывадзе (звычайна)\n"
-"  -E, --escape                выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
-"                              вывадзе, замест дадатковых сымбаляў\n"
-"      --force-po              запісваць PO файл, нават калі парожні\n"
-"      --indent                вывад з водступамі\n"
-"      --keep-header           трымаць загаловак нязьменным, не фільтраваць\n"
-"      --no-location           адкідваць радкі '#: файл:радок'\n"
-"      --add-location          дабаўляць радкі '#: файл:радок' (звычайна)\n"
-"      --strict                вывад жорстка адпаведае Uniforum\n"
-"  -w, --width=ЛІК             усталяваць шырыню вываду\n"
-"      --no-wrap               не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-"\n"
-"                              даўжэй чым шырыня, на некалькі радкоў\n"
-"  -s, --sort-output           ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file          упарадкоўваць вывад па назьве файла\n"
+msgstr ""
 
-#: src/msgfilter.c:562
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+msgid "      --indent                indented output style\n"
+msgstr ""
 
-#: src/msgfilter.c:590
+#: src/msgfilter.c:485
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
 
-#: src/msgfilter.c:641
+#: src/msgfmt.c:372
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "памылка чытаньня з падпрацэса %s"
+msgid "the argument to %s should be a single punctuation character"
+msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfilter.c:657
+#: src/msgfmt.c:419
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+msgid "invalid endianness: %s"
+msgstr ""
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
+msgstr ""
 
-#: src/msgfmt.c:318
+#: src/msgfmt.c:471
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
 
-#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
 
-#: src/msgfmt.c:400 src/msgunfmt.c:241
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257
-#: src/msgunfmt.c:263
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s рэчаісны толькі з %s"
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:422 src/msgfmt.c:428
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s і %s узаема выключны"
+
+#: src/msgfmt.c:626 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:501
+#: src/msgfmt.c:632 src/msgfmt.c:638
+#, fuzzy, c-format
+#| msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s рэчаісны толькі з %s ці %s"
+
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1083,7 +2052,7 @@ msgstr[0] "%d паведамленьне перакладзена"
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:506
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1097,7 +2066,7 @@ msgstr[2] ""
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:511
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1111,399 +2080,477 @@ msgstr[2] ""
 ",\n"
 "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:533
-#, c-format, no-wrap
+#: src/msgfmt.c:906
+#, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 
-#: src/msgfmt.c:538
-#, no-wrap
+#: src/msgfmt.c:910
+#, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:548
-#, no-wrap
+#: src/msgfmt.c:922
+#, c-format
+msgid "  filename.po ...             input files\n"
+msgstr ""
+
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
+#, c-format
+msgid "Operation mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:931
+#, c-format
 msgid ""
-"Input file location:\n"
-"  filename.po ...             input files\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"If input file is -, standard input is read.\n"
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
-"Файл уводу:\n"
-"  файл.po ...                 файл уводу\n"
-"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
-"                              файлаў\n"
-"Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
 
-#: src/msgfmt.c:556
-#, no-wrap
+#: src/msgfmt.c:933
+#, c-format
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+
+#: src/msgfmt.c:935
+#, c-format
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:937
+#, c-format
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:939
+#, c-format
 msgid ""
-"Operation mode:\n"
-"  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"Рэжым дзеяньня:\n"
-"  -j, --java                  Java рэжым: ствараць Java ResourceBundle кляс\n"
-"      --java2                 як --java, але ў дачыненьні Java2 (JDK 1.2 ці\n"
-"                              больш позьняя вэрсія)\n"
-"      --tcl                   Tcl рэжым: ствараць tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:564
-#, no-wrap
+#: src/msgfmt.c:941
+#, c-format
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr ""
+
+#: src/msgfmt.c:943
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified file\n"
-"      --strict                enable strict Uniforum mode\n"
-"If output file is -, output is written to standard output.\n"
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
-"Файл вываду:\n"
-"  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
-"      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
-"Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
 
-#: src/msgfmt.c:572
-#, no-wrap
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
+#, c-format
+msgid "      --strict                enable strict Uniforum mode\n"
+msgstr ""
+
+#: src/msgfmt.c:954 src/xgettext.c:1056
+#, c-format
+msgid "If output file is -, output is written to standard output.\n"
+msgstr ""
+
+#: src/msgfmt.c:957
+#, c-format
+msgid "Output file location in Java mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
+#, c-format
+msgid "  -r, --resource=RESOURCE     resource name\n"
+msgstr ""
+
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
+#, c-format
 msgid ""
-"Output file location in Java mode:\n"
-"  -r, --resource=RESOURCE     resource name\n"
-"  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-"The class name is determined by appending the locale name to the resource name,\n"
+msgstr ""
+
+#: src/msgfmt.c:967
+#, fuzzy, c-format
+#| msgid ""
+#| "Output file location in Java mode:\n"
+#| "  -r, --resource=RESOURCE     resource name\n"
+#| "  -l, --locale=LOCALE         locale name, either language or "
+#| "language_COUNTRY\n"
+#| "  -d DIRECTORY                base directory of classes directory "
+#| "hierarchy\n"
+#| "The class name is determined by appending the locale name to the resource "
+#| "name,\n"
+#| "separated with an underscore.  The -d option is mandatory.  The class is\n"
+#| "written under the specified directory.\n"
+msgid ""
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 "Файл вываду ў рэжыме Java:\n"
 "  -r, --resource=СРОДАК       назва сродка\n"
 "  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый клясаў\n"
-"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы сродка\n"
+"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый "
+"клясаў\n"
+"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы "
+"сродка\n"
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgfmt.c:583
-#, no-wrap
-msgid ""
-"Output file location in Tcl mode:\n"
-"  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-"  -d DIRECTORY                base directory of .msg message catalogs\n"
-"The -l and -d options are mandatory.  The .msg file is written in the\n"
-"specified directory.\n"
+#: src/msgfmt.c:973
+#, c-format
+msgid "Output file location in C# mode:\n"
 msgstr ""
-"Файл вываду ў рэжыме Tcl:\n"
-"  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя .msg каталёгаў паведамленьняў\n"
-"Выбары -l і -d абавязковыя.  Файл .msg запісваецца ў зададзеную дырэкторыю.\n"
 
-#: src/msgfmt.c:592
-#, no-wrap
+#: src/msgfmt.c:979 src/msgunfmt.c:473
+#, c-format
 msgid ""
-"Input file interpretation:\n"
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
-"      --check-format          check language dependent format strings\n"
-"      --check-header          verify presence and contents of the header entry\n"
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
-"                                menu items\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
-"Успрыняцьце файла ўводу:\n"
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
-"      --check-format          check language dependent format strings\n"
-"      --check-header          verify presence and contents of the header entry\n"
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
-"                                menu items\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:607
-#, c-format, no-wrap
+#: src/msgfmt.c:981
+#, c-format
 msgid ""
-"Output details:\n"
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-"      --no-hash               binary file will not include the hash table\n"
+"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 ""
-"Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: %d)\n"
-"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:614
-#, no-wrap
-msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"      --statistics            print statistics about translations\n"
-"  -v, --verbose               increase verbosity level\n"
+#: src/msgfmt.c:985
+#, c-format
+msgid "Output file location in Tcl mode:\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
-"      --statistics            друкуе статыстыку аб перакладах\n"
-"  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
-
-#: src/msgfmt.c:766
-msgid "plural expression can produce negative values"
-msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
 
-#: src/msgfmt.c:779
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
-
-#: src/msgfmt.c:805
-msgid "plural expression can produce division by zero"
-msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
-
-#: src/msgfmt.c:810
-msgid "plural expression can produce integer overflow"
-msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
-
-#: src/msgfmt.c:815
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
-"выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
-"дзяленьне на нуль"
-
-#: src/msgfmt.c:894 src/msgfmt.c:906
-msgid "message catalog has plural form translations..."
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
-
-#: src/msgfmt.c:897
-msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
-
-#: src/msgfmt.c:909
-msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgfmt.c:934
-msgid "invalid nplurals value"
-msgstr "нерэчаіснае значэньне nplurals"
-
-#: src/msgfmt.c:948
-msgid "invalid plural expression"
-msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
+#: src/msgfmt.c:991
+#, 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:967 src/msgfmt.c:982
+#: src/msgfmt.c:995
 #, c-format
-msgid "nplurals = %lu..."
-msgstr "nplurals = %lu..."
+msgid "Desktop Entry mode options:\n"
+msgstr ""
 
-#: src/msgfmt.c:970
+#: src/msgfmt.c:1001
 #, c-format
-msgid "...but some messages have only one plural form"
-msgid_plural "...but some messages have only %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
-msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
-msgstr[2] "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
-msgid "...but some messages have one plural form"
-msgid_plural "...but some messages have %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
-msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
-msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
 
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
-msgid "Try using the following, valid for %s:\n"
-msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
+msgid ""
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
+msgstr ""
 
-#: src/msgfmt.c:1028
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1066
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:1016
 #, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
 
-#: src/msgfmt.c:1088
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
 
-#: src/msgfmt.c:1105
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
+#: src/msgfmt.c:1036 src/xgettext.c:1073
+#, c-format
+msgid "Input file interpretation:\n"
+msgstr ""
 
-#: src/msgfmt.c:1115
+#: src/msgfmt.c:1038
 #, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
+msgid ""
+"  -c, --check                 perform all the checks implied by\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
+msgstr ""
 
-#: src/msgfmt.c:1127
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
+#: src/msgfmt.c:1041
+#, c-format
+msgid "      --check-format          check language dependent format strings\n"
+msgstr ""
 
-#: src/msgfmt.c:1139
-msgid "plural handling is a GNU gettext extension"
-msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
+#: src/msgfmt.c:1043
+#, c-format
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
 
-#: src/msgfmt.c:1204
+#: src/msgfmt.c:1045
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'"
-msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
+msgid ""
+"      --check-domain          check for conflicts between domain directives\n"
+"                                and the --output-file option\n"
+msgstr ""
 
-#: src/msgfmt.c:1242
+#: src/msgfmt.c:1048
 #, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1050
 #, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgid ""
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
+"                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1285
+#: src/msgfmt.c:1053
 #, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
+msgstr ""
 
-#: src/msgfmt.c:1289
+#: src/msgfmt.c:1058
+#, fuzzy, c-format
+#| msgid ""
+#| "Output details:\n"
+#| "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#| "%d)\n"
+#| "      --no-hash               binary file will not include the hash "
+#| "table\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"Падрабязнасьці вываду:\n"
+"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
+"%d)\n"
+"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
+
+#: src/msgfmt.c:1060
 #, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
 
-#: src/msgfmt.c:1300
-msgid "some header fields still have the initial default value\n"
-msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
+#: src/msgfmt.c:1063
+#, fuzzy, c-format
+#| msgid ""
+#| "Output details:\n"
+#| "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#| "%d)\n"
+#| "      --no-hash               binary file will not include the hash "
+#| "table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"Падрабязнасьці вываду:\n"
+"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
+"%d)\n"
+"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:1312
+#: src/msgfmt.c:1072
 #, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+msgid "      --statistics            print statistics about translations\n"
+msgstr ""
 
-#: src/msgfmt.c:1354
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
+#, c-format
+msgid "  -v, --verbose               increase verbosity level\n"
+msgstr ""
+
+#: src/msgfmt.c:1185
+#, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1187
+#, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:1367
-msgid "warning: PO file header fuzzy\n"
-msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
-
-#: src/msgfmt.c:1369
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-
-#: src/msgfmt.c:1394
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:1399
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:1410
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:1484
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1485
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1554
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msggrep.c:390
+#: src/msgfmt.c:1455
 #, c-format
-msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
-msgstr "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
+msgid "%s does not exist"
+msgstr ""
 
-#: src/msggrep.c:412
-#, no-wrap
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
+#, c-format
+msgid "error while reading \"%s\""
+msgstr "памылка ў час чытаньня \"%s\""
+
+#: src/msggrep.c:501
+#, fuzzy, c-format
+#| msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
+
+#: src/msggrep.c:521
+#, 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:439
-#, no-wrap
+#: src/msggrep.c:547
+#, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
-"  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
+"  [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n"
+"  [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n"
 "A message is selected if it comes from one of the specified source files,\n"
 "or if it comes from one of the specified domains,\n"
+"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n"
 "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
 "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
-"or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
+"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n"
+"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n"
 "\n"
 "When more than one selection criterion is specified, the set of selected\n"
 "messages is the union of the selected messages of each criterion.\n"
 "\n"
-"MSGID-PATTERN or MSGSTR-PATTERN syntax:\n"
+"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
+"EXTRACTED-COMMENT-PATTERN syntax:\n"
 "  [-E | -F] [-e PATTERN | -f FILE]...\n"
 "PATTERNs are basic regular expressions by default, or extended regular\n"
 "expressions if -E is given, or fixed strings if -F is given.\n"
 "\n"
 "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
 "  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+"  -J, --msgctxt               start of patterns for the msgctxt\n"
 "  -K, --msgid                 start of patterns for the msgid\n"
 "  -T, --msgstr                start of patterns for the msgstr\n"
+"  -C, --comment               start of patterns for the translator's comment\n"
+"  -X, --extracted-comment     start of patterns for the extracted comment\n"
 "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
 "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
 "  -f, --file=FILE             obtain PATTERN from FILE\n"
 "  -i, --ignore-case           ignore case distinctions\n"
+"  -v, --invert-match          output only the messages that do not match any\n"
+"                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:469
-#, no-wrap
+#: src/msggrep.c:602
+#, c-format
 msgid ""
-"Output details:\n"
-"      --no-escape             do not use C escapes in output (default)\n"
 "      --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"      --indent                indented output style\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
-"      --sort-output           generate sorted output\n"
-"      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msggrep.c:561
-msgid "write to grep subprocess failed"
-msgstr "памылка запісу ў падпрацэс grep"
+#: src/msggrep.c:623
+#, c-format
+msgid "      --sort-output           generate sorted output\n"
+msgstr ""
 
-#: src/msginit.c:284
+#: src/msggrep.c:625
+#, c-format
+msgid "      --sort-by-file          sort output by file location\n"
+msgstr ""
+
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1514,13 +2561,13 @@ msgstr ""
 "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
 "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створан %s.\n"
 
-#: src/msginit.c:357
-#, no-wrap
+#: src/msginit.c:371
+#, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
@@ -1528,36 +2575,43 @@ msgstr ""
 "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
 "карыстальніка.\n"
 
-#: src/msginit.c:368
-#, no-wrap
+#: src/msginit.c:381
+#, c-format
+msgid "  -i, --input=INPUTFILE       input POT file\n"
+msgstr ""
+
+#: src/msginit.c:383
+#, c-format
 msgid ""
-"Input file location:\n"
-"  -i, --input=INPUTFILE       input POT file\n"
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
-#, no-wrap
+#: src/msginit.c:389
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified PO file\n"
+msgstr ""
+
+#: src/msginit.c:391
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE      write output to specified PO file\n"
 "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:384
-#, no-wrap
+#: src/msginit.c:404
+#, c-format
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
+msgstr ""
+
+#: src/msginit.c:406
+#, c-format
 msgid ""
-"Output details:\n"
-"  -l, --locale=LL_CC          set target locale\n"
 "      --no-translator         assume the PO file is automatically generated\n"
-"  -w, --width=NUMBER          set output page width\n"
-"      --no-wrap               do not break long message lines, longer than\n"
-"                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msginit.c:437
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1565,11 +2619,12 @@ msgstr ""
 "Знойдзен больш чым адзін .pot файл.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:445 src/msginit.c:450
+#: src/msginit.c:480 src/msginit.c:485
+#, c-format
 msgid "error reading current directory"
 msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msginit.c:458
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1577,84 +2632,101 @@ msgstr ""
 "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165
-#: src/read-java.c:80
-msgid "fdopen() failed"
-msgstr "fdopen() памылка"
-
-#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr "падпрацэс %s, памылка ўводу-вываду"
-
-#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179
-#: src/read-java.c:90
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1088
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1432
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Беларускі пераклад для %s"
 
-#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
+#: src/msgl-cat.c:178 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:196 src/msgl-iconv.c:329
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
 
-#: src/msgl-cat.c:209
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:203
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:213
-#, c-format
-msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:207
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
 msgstr ""
+"уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
+"са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:374 src/msgl-iconv.c:406
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
+#, c-format
 msgid "warning: "
 msgstr "увага: "
 
-#: src/msgl-cat.c:425
+#: src/msgl-cat.c:444
+#, 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:431
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-charset.c:93
+#: src/msgl-cat.c:489
+#, c-format
+msgid ""
+"Conversion of file %s from %s encoding to %s encoding\n"
+"changes some msgids or msgctxts.\n"
+"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
+"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
+msgstr ""
+
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -1663,12 +2735,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -1676,7 +2748,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -1685,7 +2757,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -1693,30 +2765,229 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
-msgid "conversion failure"
-msgstr "памылка пераўтварэньня"
+#: src/msgl-check.c:134
+msgid "plural expression can produce negative values"
+msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
+
+#: src/msgl-check.c:145
+#, c-format
+msgid "nplurals = %lu but plural expression can produce values as large as %lu"
+msgstr ""
+"nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
+
+#: src/msgl-check.c:191
+msgid "plural expression can produce division by zero"
+msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
 
-#: src/msgl-iconv.c:351
+#: src/msgl-check.c:196
+msgid "plural expression can produce integer overflow"
+msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
+
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
+"дзяленьне на нуль"
+
+#: src/msgl-check.c:270
+#, fuzzy, c-format
+#| msgid "Try using the following, valid for %s:\n"
+msgid "Try using the following, valid for %s:"
+msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
+
+#: src/msgl-check.c:362 src/msgl-check.c:386
+#, fuzzy
+#| msgid "message catalog has plural form translations..."
+msgid "message catalog has plural form translations"
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+
+#: src/msgl-check.c:364
+#, fuzzy
+#| msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
+
+#: src/msgl-check.c:388
+#, fuzzy
+#| msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
+
+#: src/msgl-check.c:424
+msgid "invalid nplurals value"
+msgstr "нерэчаіснае значэньне nplurals"
+
+#: src/msgl-check.c:446
+msgid "invalid plural expression"
+msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
+
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, fuzzy, c-format
+#| msgid "nplurals = %lu..."
+msgid "nplurals = %lu"
+msgstr "nplurals = %lu..."
+
+#: src/msgl-check.c:478
+#, fuzzy, c-format
+#| msgid "...but some messages have only one plural form"
+#| msgid_plural "...but some messages have only %lu plural forms"
+msgid "but some messages have only one plural form"
+msgid_plural "but some messages have only %lu plural forms"
+msgstr[0] "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
+msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
+msgstr[2] ""
+"...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
+
+#: src/msgl-check.c:494
+#, fuzzy, c-format
+#| msgid "...but some messages have one plural form"
+#| msgid_plural "...but some messages have %lu plural forms"
+msgid "but some messages have one plural form"
+msgid_plural "but some messages have %lu plural forms"
+msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
+msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
+msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
+
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
+
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
+
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
+
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
+
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
+
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
+
+#: src/msgl-check.c:692
+msgid "plural handling is a GNU gettext extension"
+msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
+
+#: src/msgl-check.c:733
+#, c-format
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr ""
+
+#: src/msgl-check.c:744
+#, c-format
+msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgstr ""
+
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
+
+#: src/msgl-check.c:835
+#, fuzzy, c-format
+#| msgid "headerfield `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
+msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
+#, c-format
+msgid "%s: input is not valid in \"%s\" encoding"
+msgstr ""
+
+#: src/msgl-iconv.c:69
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "памылка ў час чытаньня файла \"%s\""
+
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgl-iconv.c:369
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
+#, 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:330
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:385
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:358
+#: src/msgmerge.c:426 src/msgmerge.c:432
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s рэчаісны толькі з %s"
+
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:395
-#, no-wrap
+#: src/msgmerge.c:545
+#, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -1729,186 +3000,222 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:413
-#, no-wrap
+#: src/msgmerge.c:562
+#, c-format
+msgid "  def.po                      translations referring to old sources\n"
+msgstr ""
+
+#: src/msgmerge.c:564
+#, c-format
+msgid "  ref.pot                     references to new sources\n"
+msgstr ""
+
+#: src/msgmerge.c:568
+#, c-format
 msgid ""
-"Input file location:\n"
-"  def.po                      translations referring to old sources\n"
-"  ref.pot                     references to new sources\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:423
-#, no-wrap
+#: src/msgmerge.c:574
+#, c-format
 msgid ""
-"Operation mode:\n"
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:438
-#, no-wrap
+#: src/msgmerge.c:586
+#, c-format
+msgid "Output file location in update mode:\n"
+msgstr ""
+
+#: src/msgmerge.c:588
+#, c-format
+msgid "The result is written back to def.po.\n"
+msgstr ""
+
+#: src/msgmerge.c:590
+#, c-format
+msgid "      --backup=CONTROL        make a backup of def.po\n"
+msgstr ""
+
+#: src/msgmerge.c:592
+#, c-format
+msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
+msgstr ""
+
+#: src/msgmerge.c:594
+#, c-format
 msgid ""
-"Output file location in update mode:\n"
-"The result is written back to def.po.\n"
-"      --backup=CONTROL        make a backup of def.po\n"
-"      --suffix=SUFFIX         override the usual backup suffix\n"
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+msgstr ""
+
+#: src/msgmerge.c:601
+#, c-format
+msgid ""
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:477
-#, no-wrap
+#: src/msgmerge.c:610
+#, c-format
 msgid ""
-"Informative output:\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"  -v, --verbose               increase verbosity level\n"
-"  -q, --quiet, --silent       suppress progress indicators\n"
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+
+#: src/msgmerge.c:615
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+
+#: src/msgmerge.c:672 src/urlget.c:191
+#, c-format
+msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
-"  -v, --verbose               павялічыць узровень шматслоўнасьці\n"
-"  -q, --quiet, --silent       забараняць паказальнікі дасягненьняў\n"
 
-#: src/msgmerge.c:937
+#: src/msgmerge.c:1685
+#, c-format
 msgid "this message should define plural forms"
 msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:960
+#: src/msgmerge.c:1706
+#, c-format
 msgid "this message should not define plural forms"
 msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1091
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
 "прапушчана %ld, састарэлых %ld.\n"
 
-#: src/msgmerge.c:1099
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " зроблена.\n"
 
-#: src/msgunfmt.c:226 src/msgunfmt.c:235
+#: 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:319
-#, c-format, no-wrap
+#: src/msgunfmt.c:427
+#, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:324
-#, no-wrap
+#: src/msgunfmt.c:431
+#, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
 
-#: src/msgunfmt.c:334
-#, no-wrap
+#: src/msgunfmt.c:440
+#, fuzzy, c-format
+#| msgid ""
+#| "Operation mode:\n"
+#| "  -j, --java               Java mode: input is a Java ResourceBundle "
+#| "class\n"
+#| "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
 msgid ""
-"Operation mode:\n"
-"  -j, --java               Java mode: input is a Java ResourceBundle class\n"
-"      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "Рэжым дзеяньня:\n"
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:341
-#, no-wrap
-msgid ""
-"Input file location:\n"
-"  FILE ...                 input .mo files\n"
-"If no input file is given or if it is -, standard input is read.\n"
+#: src/msgunfmt.c:442
+#, c-format
+msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
-"Файл уводу:\n"
-"  ФАЙЛ ...                 .mo файлы\n"
-"Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgunfmt.c:348
-#, no-wrap
+#: src/msgunfmt.c:444
+#, c-format
 msgid ""
-"Input file location in Java mode:\n"
-"  -r, --resource=RESOURCE  resource name\n"
-"  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-"The class name is determined by appending the locale name to the resource name,\n"
-"separated with an underscore.  The class is located using the CLASSPATH.\n"
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgunfmt.c:357
-#, no-wrap
+#: src/msgunfmt.c:446
+#, fuzzy, c-format
+#| msgid ""
+#| "Operation mode:\n"
+#| "  -j, --java               Java mode: input is a Java ResourceBundle "
+#| "class\n"
+#| "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
 msgid ""
-"Input file location in Tcl mode:\n"
-"  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
-"  -d DIRECTORY             base directory of .msg message catalogs\n"
-"The -l and -d options are mandatory.  The .msg file is located in the\n"
-"specified directory.\n"
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:366
-#, no-wrap
+#: src/msgunfmt.c:451
+#, c-format
+msgid "  FILE ...                    input .mo files\n"
+msgstr ""
+
+#: src/msgunfmt.c:456
+#, c-format
+msgid "Input file location in Java mode:\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -o, --output-file=FILE   write output to specified file\n"
-"The results are written to standard output if no output file is specified\n"
-"or if it is -.\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
+"separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:374
-#, no-wrap
+#: src/msgunfmt.c:467
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr ""
+
+#: src/msgunfmt.c:475
+#, c-format
 msgid ""
-"Output details:\n"
-"  -e, --no-escape          do not use C escapes in output (default)\n"
-"  -E, --escape             use C escapes in output, no extended chars\n"
-"      --force-po           write PO file even if empty\n"
-"  -i, --indent             write indented output style\n"
-"      --strict             write strict uniforum style\n"
-"  -w, --width=NUMBER       set output page width\n"
-"      --no-wrap            do not break long message lines, longer than\n"
-"                           the output page width, into several lines\n"
-"  -s, --sort-output        generate sorted output\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                           вывадзе (звычайна)\n"
-"  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
-"                           без дадатковых сімвалаў\n"
-"      --force-po           запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent             запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --strict             запісваць .po файл, жорстка адпавядаючы\n"
-"                           пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
-"      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-"\n"
-"                           даўжэй чым шырыня, на некалькі радкоў\n"
-"  -s, --sort-output        ствараць упарадкаваны вывад\n"
+"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:388
-#, no-wrap
+#: src/msgunfmt.c:479
+#, c-format
+msgid "Input file location in Tcl mode:\n"
+msgstr ""
+
+#: src/msgunfmt.c:485
+#, c-format
 msgid ""
-"Informative output:\n"
-"  -h, --help               display this help and exit\n"
-"  -V, --version            output version information and exit\n"
-"  -v, --verbose            increase verbosity level\n"
+"The -l and -d options are mandatory.  The .msg file is located in the\n"
+"specified directory.\n"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help               адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version            выводзіць зьвесткі аб версіі й выходзіць\n"
-"  -v, --verbose            павялічыць узровень шматслоўнасьці\n"
 
-#: src/msguniq.c:284
-#, no-wrap
+#: src/msgunfmt.c:511
+#, c-format
+msgid "  -i, --indent                write indented output style\n"
+msgstr ""
+
+#: src/msgunfmt.c:513
+#, c-format
+msgid "      --strict                write strict uniforum style\n"
+msgstr ""
+
+#: src/msguniq.c:331
+#, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
 "Finds duplicate translations of the same message ID.  Such duplicates are\n"
@@ -1920,70 +3227,32 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:317
-#, no-wrap
+#: src/msguniq.c:364
+#, c-format
+msgid "  -d, --repeated              print only duplicates\n"
+msgstr ""
+
+#: src/msguniq.c:366
+#, fuzzy, c-format
+#| msgid ""
+#| "Message selection:\n"
+#| "  -d, --repeated                 print only duplicates\n"
+#| "  -u, --unique                   print only unique messages, discard "
+#| "duplicates\n"
 msgid ""
-"Message selection:\n"
-"  -d, --repeated                 print only duplicates\n"
-"  -u, --unique                   print only unique messages, discard duplicates\n"
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "Выбар паведамленьня:\n"
 "  -d, --repeated                 друкаваць толькі паўтараючыеся\n"
 "  -u, --unique                   друкаваць толькі непаўторныя\n"
 
-#: src/ngettext.c:215
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-
-#: src/ngettext.c:220
-#, no-wrap
-msgid ""
-"Display native language translation of a textual message whose grammatical\n"
-"form depends on a number.\n"
-msgstr ""
-"Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
-"граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
-
-#: src/ngettext.c:225
-#, no-wrap
-msgid ""
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  COUNT                     choose singular/plural form based on this value\n"
-msgstr ""
-
-#: src/ngettext.c:236
-#, c-format, no-wrap
-msgid ""
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"Standard search directory: %s\n"
-msgstr ""
-"Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
-"асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
-"дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-"асяроддзя TEXTDOMAINDIR.\n"
-"Стандартная дырэкторыя для пошуку: %s\n"
-
-#: src/open-po.c:60
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
-#: src/po-charset.c:337
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: увага: "
-
-#: src/po-charset.c:226
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1992,15 +3261,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
 "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
 
-#: src/po-charset.c:279 src/po-charset.c:309
-msgid "Continuing anyway, expect parse errors."
-msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
-
-#: src/po-charset.c:281
-msgid "Continuing anyway."
-msgstr "Працяг выкананьня..."
-
-#: src/po-charset.c:284
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2009,7 +3270,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:293 src/po-charset.c:319
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2017,12 +3278,15 @@ msgstr ""
 "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
 "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:298 src/po-charset.c:323
-#, c-format
-msgid "%s\n"
-msgstr "%s\n"
+#: src/po-charset.c:578 src/po-charset.c:616
+msgid "Continuing anyway, expect parse errors."
+msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
 
-#: src/po-charset.c:312
+#: src/po-charset.c:580
+msgid "Continuing anyway."
+msgstr "Працяг выкананьня..."
+
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2031,165 +3295,404 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/po-charset.c:338
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Прапушчан набор сімвалаў ў загалоўке.\n"
-"Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не будзе.\n"
+"Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не "
+"будзе.\n"
 
-#: po-gram-gen.y:92
+#: src/po-gram-gen.y:94
+#, c-format
 msgid "inconsistent use of #~"
 msgstr "несумяшчальнае ўжываньне #~"
 
-#: po-gram-gen.y:182
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "прапушчана секцыя \"msgstr[]\""
 
-#: po-gram-gen.y:190
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "прапушчана секцыя \"msgid_plural\""
 
-#: po-gram-gen.y:197
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "прапушчана секцыя \"msgstr\""
 
-#: po-gram-gen.y:242
+#: src/po-gram-gen.y:397
+#, c-format
 msgid "first plural form has nonzero index"
 msgstr "першая форма ліку мае ненулявы індэкс"
 
-#: po-gram-gen.y:244
+#: src/po-gram-gen.y:399
+#, c-format
 msgid "plural form has wrong index"
 msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141
-#: src/po-lex.c:111 src/po-lex.c:144
+#: src/po-lex.c:90 src/po-lex.c:109
+#, c-format
 msgid "too many errors, aborting"
 msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
+#, c-format
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:543
+#: src/po-lex.c:465
+#, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#: src/po-lex.c:553
+#: src/po-lex.c:474
+#, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#: src/po-lex.c:561
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
-#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "памылка ў час чытаньня \"%s\""
-
-#: src/po-lex.c:825
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:935
+#: src/po-lex.c:852
+#, c-format
 msgid "invalid control sequence"
 msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:1043
+#: src/po-lex.c:979
+#, c-format
 msgid "end-of-file within string"
 msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1049
+#: src/po-lex.c:985
+#, c-format
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214
+#: src/po-lex.c:1006
+#, c-format
+msgid "context separator <EOT> within string"
+msgstr ""
+
+#: src/read-catalog.c:325 src/xgettext.c:1228
+#, c-format
+msgid "this file may not contain domain directives"
+msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
+
+#: src/read-catalog.c:370
+msgid "duplicate message definition"
+msgstr "двайное вызначэньне паведамленьня"
+
+#: src/read-catalog.c:372
+#, fuzzy
+#| msgid "...this is the location of the first definition"
+msgid "this is the location of the first definition"
+msgstr "...гэта месцазнаходжаньне першага вызначэньня"
+
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "прапушчана назва фільтра"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "нерэчаіснае значэньне nplurals"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл \"%s\" абрэзан"
 
-#: src/read-mo.c:143
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
 
-#: src/read-mo.c:181 src/read-mo.c:289
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "фармат файла \"%s\" не GNU .mo"
 
-#: src/read-mo.c:194
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
-#: src/urlget.c:150
+#: src/read-properties.c:357
+msgid "warning: invalid \\uxxxx syntax for Unicode character"
+msgstr ""
+
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr ""
+
+#: src/read-stringtable.c:802
+#, fuzzy
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "warning: unterminated string"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/read-stringtable.c:810
+#, fuzzy
+#| msgid "warning: "
+msgid "warning: syntax error"
+msgstr "увага: "
+
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "warning: unterminated key/value pair"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/read-stringtable.c:940
+msgid "warning: syntax error, expected ';' after string"
+msgstr ""
+
+#: src/read-stringtable.c:948
+msgid "warning: syntax error, expected '=' or ';' after string"
+msgstr ""
+
+#: src/recode-sr-latin.c:115
+#, fuzzy, c-format
+#| msgid "Written by %s.\n"
+msgid "Written by %s and %s.\n"
+msgstr "Аўтар %s.\n"
+
+#. TRANSLATORS: This is a proper name. The last name is
+#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
+#. "&Scaron;egan".
+#. This is a proper name. See the gettext manual, section Names.
+#: src/recode-sr-latin.c:119
+msgid "Danilo Segan"
+msgstr ""
+
+#: src/recode-sr-latin.c:152
+#, c-format, no-wrap
+msgid "Recode Serbian text from Cyrillic to Latin script.\n"
+msgstr ""
+
+#: src/recode-sr-latin.c:155
+#, c-format, no-wrap
+msgid ""
+"The input text is read from standard input.  The converted text is output to\n"
+"standard output.\n"
+msgstr ""
+
+#: src/recode-sr-latin.c:335
+#, c-format
+msgid "input is not valid in \"%s\" encoding"
+msgstr ""
+
+#: src/recode-sr-latin.c:363
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "памылка ў час чытаньня файла \"%s\""
+
+#: src/urlget.c:158
+#, c-format
 msgid "expected two arguments"
 msgstr "чакалісь два аргумэнты"
 
-#: src/urlget.c:169
-#, c-format, no-wrap
+#: src/urlget.c:175
+#, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#: src/urlget.c:174
-#, no-wrap
+#: src/urlget.c:180
+#, 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:222
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "памылка чытаньня \"%s\""
+
+#: src/urlget.c:233
+#, c-format
 msgid "error writing stdout"
 msgstr "памылка запісу ў stdout"
 
-#: src/write-java.c:1109
-msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "памылка пасля чытаньня \"%s\""
 
-#: src/write-java.c:1119
+#: src/urlget.c:263
 #, c-format
-msgid "cannot create a temporary directory using template \"%s\""
+msgid "Retrieving %s..."
 msgstr ""
-"немагчыма стварыць часовую дырэкторыю,\n"
-"выкарыстоўвываючы ўзор \"%s\""
 
-#: src/write-java.c:1132
+#: src/urlget.c:296
 #, c-format
-msgid "not a valid Java class name: %s"
-msgstr "нерэчаісная назва Java-класа: %s"
+msgid " timed out.\n"
+msgstr ""
 
-#: src/write-java.c:1189 src/write-java.c:1202
+#: src/urlget.c:433
 #, c-format
-msgid "failed to create \"%s\""
-msgstr "немагчыма стварыць \"%s\""
+msgid " failed.\n"
+msgstr ""
+
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+
+#: src/write-catalog.c:201
+#, fuzzy
+#| msgid "message catalog has plural form translations..."
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
-msgid "error while writing \"%s\" file"
-msgstr "памылка ў час запісу файла \"%s\""
+msgid "cannot create output file \"%s\""
+msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: src/write-java.c:1224
-msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+#: src/write-catalog.c:237 src/write-catalog.c:282
+msgid "standard output"
+msgstr "стандартны вывад"
+
+#: src/write-csharp.c:708
+#, fuzzy, c-format
+#| msgid "failed to create \"%s\""
+msgid "failed to create directory \"%s\""
+msgstr "немагчыма стварыць \"%s\""
+
+#: src/write-csharp.c:771
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-mo.c:701
+#: src/write-csharp.c:773
+#, fuzzy, c-format
+#| msgid "communication with %s subprocess failed"
+msgid "compilation of C# class failed"
+msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:415
+#: src/write-java.c:1096
 #, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
+msgid "not a valid Java class name: %s"
+msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-po.c:783 src/write-po.c:877
+#: src/write-java.c:1216
+#, c-format
+msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgstr ""
+"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+"ці ўсталяваць пераменную асяроддзя $JAVAC"
+
+#: src/write-java.c:1219
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+"ці ўсталяваць пераменную асяроддзя $JAVAC"
+
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "нерэчаісная шматсімвальная паслядоўнасць"
+
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
+
+#: src/write-po.c:1334 src/write-po.c:1502
+#, fuzzy, c-format
+#| msgid ""
+#| "The following msgid contains non-ASCII characters.\n"
+#| "This will cause problems to translators who use a character encoding\n"
+#| "different from yours. Consider using a pure ASCII msgid instead.\n"
+#| "%s\n"
+msgid ""
+"The following msgctxt contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgctxt instead.\n"
+"%s\n"
+msgstr ""
+"Бягучы msgid зьмяшчае не ASCII сымбалі.\n"
+"Гэта будзе выклікаць складанасьці ў перакладчыкаў, якія выкарыстоўвываюць\n"
+"кадзіроўку, якая адрозьніваецца ад вашае. Разглядзіце магчымасьць\n"
+"выкарыстаньня толькі ASCII сымбаляў у msgid\n"
+"%s\n"
+
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2203,182 +3706,1500 @@ msgstr ""
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-po.c:944
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "немагчыма стварыць файл вываду \"%s\""
+#: src/write-qt.c:668
+msgid ""
+"message catalog has plural form translations\n"
+"but the Qt message catalog format doesn't support plural handling\n"
+msgstr ""
 
-#: src/write-po.c:951
-#, no-c-format
-msgid "standard output"
-msgstr "стандартны вывад"
+#: src/write-qt.c:694
+msgid ""
+"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 ""
 
-#: src/x-c.c:954
+#: src/write-qt.c:718
+msgid ""
+"message catalog has msgid 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 untranslated strings\n"
+msgstr ""
+
+#: src/write-resources.c:96
+#, fuzzy, c-format
+#| msgid "error while writing \"%s\" file"
+msgid "error while writing to %s subprocess"
+msgstr "памылка ў час запісу файла \"%s\""
+
+#: src/write-resources.c:133
+msgid ""
+"message catalog has context dependent translations\n"
+"but the C# .resources format doesn't support contexts\n"
+msgstr ""
+
+#: src/write-resources.c:152
+msgid ""
+"message catalog has plural form translations\n"
+"but the C# .resources format doesn't support plural handling\n"
+msgstr ""
+
+#: src/write-tcl.c:159
+msgid ""
+"message catalog has context dependent translations\n"
+"but the Tcl message catalog format doesn't support contexts\n"
+msgstr ""
+
+#: src/write-tcl.c:178
+msgid ""
+"message catalog has plural form translations\n"
+"but the Tcl message catalog format doesn't support plural handling\n"
+msgstr ""
+
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated string"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-awk.c:591
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated regular expression"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated character constant"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:978
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-po.c:106 src/xgettext.c:648
-msgid "this file may not contain domain directives"
-msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
+#: src/x-csharp.c:225
+msgid "Please specify the source encoding through --from-code."
+msgstr ""
 
-#: src/x-rst.c:108
+#: src/x-csharp.c:269
 #, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
 
-#: src/x-rst.c:168
+#: src/x-csharp.c:285
 #, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: прапушчан нумар пасьля #"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
 
-#: src/x-rst.c:203
+#: src/x-csharp.c:297
 #, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: нерэчаісны выраз-радок"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
 
-#: src/xgettext.c:401
+#: 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:315 src/x-javascript.c:321 src/x-python.c:375
+#, fuzzy, c-format
+#| msgid "iconv failure"
+msgid "%s:%d: iconv failure"
+msgstr "памылка iconv"
+
+#: 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:1451 src/x-java.c:668
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated character constant"
+msgid "%s:%d: warning: unterminated string constant"
+msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
+
+#: src/x-csharp.c:1953 src/x-java.c:1153
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr ""
+
+#: src/x-csharp.c:1983 src/x-java.c:1183
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr ""
+
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+
+#: src/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "невядомая мова `%s'"
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr ""
+
+#: src/xgettext.c:701
+#, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:406
+#: src/xgettext.c:705
+#, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:502
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
+
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:547
-#, no-wrap
+#: src/xgettext.c:1027
+#, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:552
-#, no-wrap
+#: src/xgettext.c:1050
+#, c-format
 msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
-"Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
-"і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/xgettext.c:567
-#, no-wrap
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr ""
+
+#: src/xgettext.c:1054
+#, c-format
 msgid ""
-"Output file location:\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-"If output file is -, output is written to standard output.\n"
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:576
-#, no-wrap
+#: src/xgettext.c:1059
+#, fuzzy, c-format
+#| msgid "no input file given"
+msgid "Choice of input file language:\n"
+msgstr "невызначан уваходзячы файл"
+
+#: src/xgettext.c:1061
+#, c-format
 msgid ""
-"Choice of input file language:\n"
-"  -L, --language=NAME            recognise the specified language\n"
-"                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
-"                                   EmacsLisp, librep, Java, awk, YCP, Tcl,\n"
-"                                   RST, Glade)\n"
-"  -C, --c++                      shorthand for --language=C++\n"
-"By default the language is guessed depending on the input file name extension.\n"
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:587
-#, no-wrap
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr ""
+
+#: src/xgettext.c:1070
+#, c-format
 msgid ""
-"Operation mode:\n"
-"  -j, --join-existing            join messages with existing file\n"
-"  -x, --exclude-file=FILE.po     entries from FILE.po are not extracted\n"
-"  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-"                                 preceding keyword lines) in output file\n"
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 
-#: src/xgettext.c:596
-#, no-wrap
+#: src/xgettext.c:1075
+#, c-format
 msgid ""
-"Language=C/C++ specific options:\n"
-"  -a, --extract-all              extract all strings\n"
-"  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
-"                                 WORD means not to use default keywords)\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"      --debug                    more detailed formatstring recognition result\n"
-msgstr ""
-"Асаблівасьці для C/C++:\n"
-"  -a, --extract-all              атрымаць усе радкі\n"
-"  -k, --keyword[=СЛОВА]          дадатковае ключавое слова для пошуку (бяз\n"
-"                                 СЛОВА азначае не выкарыстоўваць неабумоўленыя\n"
-"                                 ключавыя словы\n"
-"  -T, --trigraphs                разумець ANSI C трыграфы пры ўводзе\n"
-"      --debug                    больш падрабязны вынік разбору радка\n"
-"                                 фарматаваньня\n"
-
-#: src/xgettext.c:606
-#, fuzzy, no-wrap
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr ""
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr ""
+
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr ""
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr ""
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr ""
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr ""
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr ""
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr ""
+
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+
+#: src/xgettext.c:1597
+#, c-format
 msgid ""
-"Output details:\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"      --force-po                 write PO file even if empty\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -w, --width=NUMBER             set output page width\n"
-"      --no-wrap                  do not break long message lines, longer than\n"
-"                                 the output page width, into several lines\n"
-"  -s, --sort-output              generate sorted output\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"      --copyright-holder=STRING  set copyright holder in output\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-msgstr ""
-"Дэталі вываду:\n"
-"  -e, --no-escape                не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-"                                 вывадзе (звычайна)\n"
-"  -E, --escape                   выкарыстоўваць Сі ESC пасьлядоўнасьці ў\n"
-"                                 вывадзе, без дадатковых сымбаляў\n"
-"      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
-"  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
-"                                 пагадненьню Uniforum\n"
-"  -w, --width=ШЫРЫНЯ             вызначыць шырыню старонкі вываду\n"
-"      --no-wrap                  не разбураць доўгія радкі, даўжэйшыя за\n"
-"                                 шырыню старонкі вываду, на некалькі радкоў\n"
-"  -s, --sort-output              ствараць упарадкаваны вывад\n"
-"  -F, --sort-by-file             упарадкаваць вывад па шляху да файла\n"
-"      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
-"      --copyright-holder=STRING  set copyright holder in output\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-
-#: src/xgettext.c:828
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:943
+#: src/xgettext.c:1872
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"Пусты msgid.  Зарэзэрваваны GNU gettext:\n"
-"gettext(\"\") вяртае загаловак зь\n"
-"метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:1299
-#, c-format
-msgid "language `%s' unknown"
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
 msgstr "невядомая мова `%s'"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:303
+#, 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-javascript.c:312
+#, 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-javascript.c:344
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "warning: this message is not used"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr ""
+
+#: src/x-perl.c:1074
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr ""
+
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1249
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-python.c:279
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:325
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:342
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:355
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:365
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:398
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: прапушчан нумар пасьля #"
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: нерэчаісны выраз-радок"
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: нерэчаіснае вызначэньне радка"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr ""
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "нерэчаісная кантралюючая паслядоўнасць"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "нерэчаісная назва Java-класа: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "нерэчаісная назва Java-класа: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "нерэчаісная кантралюючая паслядоўнасць"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "нерэчаісная шматсімвальная паслядоўнасць"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid character after '%s'"
+msgstr "нерэчаісны аргумэнт `%s' для `%s'"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "прапушчана назва фільтра"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: нераспазнаны выбар `--%s'\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: несапраўдны выбар -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: выбар `-W %s' неадназначны\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
+#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
+#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
+
+#~ msgid "missing arguments"
+#~ msgstr "прапушчаны аргумэнты"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+#~ "or:    %s [OPTION] -s [MSGID]...\n"
+#~ msgstr ""
+#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
+#~ "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
+
+#, no-wrap
+#~ msgid "Display native language translation of a textual message.\n"
+#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=TEXTDOMAIN   вяртае перакладзеныя паведамленьні з TEXTDOMAIN\n"
+#~ "  -e                        выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
+#~ "  -E                        (ігнаруецца для сумяшчальнасьці)\n"
+#~ "  -h, --help                адлюстроўвае гэту дапамогу й выходзіць\n"
+#~ "  -n                        стрымлівае цягнучыеся новыя радкі\n"
+#~ "  -V, --version             адлюстроўвае зьветскі аб версіі й выходзіць\n"
+#~ "  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
+#~ "                            MSGID з TEXTDOMAIN\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#~ "regular directory, another location can be specified with the environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
+#~ "асяроддзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
+#~ "каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
+#~ "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  INPUTFILE                   уваходзячы PO файл\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                              файлаў\n"
+#~ "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "      --translated            keep translated, remove untranslated messages\n"
+#~ "      --untranslated          keep untranslated, remove translated messages\n"
+#~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+#~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+#~ "      --no-obsolete           remove obsolete #~ messages\n"
+#~ "      --only-obsolete         keep obsolete #~ messages\n"
+#~ msgstr ""
+#~ "Выбар паведамленьня:\n"
+#~ "      --translated            пакідае перакладзеныя, прымае неперакладзеныя\n"
+#~ "                              паведамленьні\n"
+#~ "      --untranslated          пакідае неперакладзеныя, прымае перакладзеныя\n"
+#~ "                              паведамленьні\n"
+#~ "      --no-fuzzy              прымае паведамленьні, азначаныя як 'fuzzy'\n"
+#~ "      --only-fuzzy            пакідае паведамленьні, азначаныя як 'fuzzy'\n"
+#~ "      --no-obsolete           прымае састарэлыя #~ паведамленьні\n"
+#~ "      --only-obsolete         пакіде састарэлыя #~ паведамленьні\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Attribute manipulation:\n"
+#~ "      --set-fuzzy             set all messages 'fuzzy'\n"
+#~ "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+#~ "      --set-obsolete          set all messages obsolete\n"
+#~ "      --clear-obsolete        set all messages non-obsolete\n"
+#~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+#~ msgstr ""
+#~ "Узьдзеяньне на атрыбуты:\n"
+#~ "      --set-fuzzy             усталёўвае ўсе паведамленьні як 'fuzzy'\n"
+#~ "      --clear-fuzzy           усталёўвае ўсе паведамленьні як не 'fuzzy'\n"
+#~ "      --set-obsolete          усталёўвае ўсе паведамленьні як састарэлыя\n"
+#~ "      --clear-obsolete        усталёўвае ўсе паведамленьні як несастарэлыя\n"
+#~ "      --fuzzy                 тое, што й --only-fuzzy --clear-fuzzy\n"
+#~ "      --obsolete              тое, што й --only-obsolete --clear-obsolete\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                write the .po file using indented style\n"
+#~ "      --no-location           do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе;\n"
+#~ "                              без дадатковых сімвалаў\n"
+#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                              пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE ...                  input files\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  УВАХОДЗЯЧЫ_ФАЙЛ ...            уваходзячыя файлы\n"
+#~ "  -f, --files-from=ФАЙЛ          атрымліваць сьпіс уваходзячый файлаў з ФАЙЛА\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ     дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                                 файлаў\n"
+#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE         write output to specified file\n"
+#~ "The results are written to standard output if no output file is specified\n"
+#~ "or if it is -.\n"
+#~ msgstr ""
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ         запісваць вывад у азначаны файл\n"
+#~ "Вынікі запісваюцца ў стандартны вывад, калі імя файла не зададзена, ці\n"
+#~ "замест яго -.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 0 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна не\n"
+#~ "                                 абмежавана\n"
+#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна 0\n"
+#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
+#~ "                                 непаўторныя паведамленьні будуць надрукаваны\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -t, --to-code=NAME             encoding for output\n"
+#~ "      --use-first                use first available translation for each\n"
+#~ "                                 message, don't merge several translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape                не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                                 без дадатковых сімвалаў\n"
+#~ "      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                                 выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                     адлюстроўвае гэту дапамогу і выходзіць\n"
+#~ "  -V, --version                  выводзіць зьвесткі аб версіі і выходзіць\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  def.po                      translations\n"
+#~ "  ref.pot                     references to the sources\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  def.po                      пераклады\n"
+#~ "  ref.pot                     спасылкі на крыніцы\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку файлаў ўводу\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Message selection:\n"
+#~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 set\n"
+#~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#~ "                                 definitions, defaults to 1 if not set\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ "  -<, --less-than=ЛІК            друкаваць паведамленьні, якія маюць меньш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна не\n"
+#~ "                                 абмежавана\n"
+#~ "  ->, --more-than=ЛІК            друкаваць паведамленьні, якія маюць больш\n"
+#~ "                                 вызначэньняў, чым зададзена; звычайна 1\n"
+#~ "  -u, --unique                   скарачэньне для --less-than=2, толькі\n"
+#~ "                                 непаўторныя паведамленьні будуць надрукаваны\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ msgstr ""
+#~ "Падрабязнасьці вываду:n  -e, --no-escape                не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе замест дадатковых сымбаляў\n"
+#~ "      --force-po                 запісваць PO файл, нават калі ён парожні\n"
+#~ "  -i, --indent                   запісваць .po f файл з водступамі\n"
+#~ "      --no-location              не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location             ствараць радкі '#: імя_файла:радок' радкі\n"
+#~ "                                 (гэты выбар выкарыстоўваецца неабумоўленым)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             усталёўваць шырыню вывадзімай старонкі\n"
+#~ "      --no-wrap                  не разьбіваць радкі доўгіх паведамленьняў,\n"
+#~ "                                 даўжэйшыя за шырыню старонкі вываду, на\n"
+#~ "                                 некалькі радкоў\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкоўваць вывад па шляху да файлу\n"
+#~ "      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape             не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                              без дадатковых сімвалаў\n"
+#~ "      --force-po              запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location           не запісваць радкі '#: імя_файла:радок'\n"
+#~ "  -n, --add-location          ствараць радкі '#: імя_файла:радок' радкі (гэты\n"
+#~ "                              выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ "      --strict                запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                              пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ          усталёўваць шырыню вывадзімай старонкі\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  INPUTFILE                   input PO or POT file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Уваходзячы файл:\n"
+#~ "  INPUTFILE                   уваходзячы PO ці POT файл\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  -i, --input=INPUTFILE       input PO file\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If no input file is given or if it is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Уваходзячы файл:\n"
+#~ "  -i, --input=INPUTFILE       PO файл уводу\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+#~ "Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+#~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+#~ "                                to be executed\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+#~ msgstr ""
+#~ "Карысныя ВЫБАРы-ФІЛЬТАРУ, калі ФІЛЬТАР гэта 'sed':\n"
+#~ "  -e, --expression=SCRIPT     дадае SCRIPT да загадаў, якія будуць выкананы\n"
+#~ "  -f, --file=SCRIPTFILE       дадае зьмест SCRIPTFILE да загадаў, якія будуць\n"
+#~ "                              выкананы\n"
+#~ "  -n, --quiet, --silent       выключаць аўтаматычны друк прыклада\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "      --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "      --indent                indented output style\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "                              the output page width, into several lines\n"
+#~ "  -s, --sort-output           generate sorted output\n"
+#~ "  -F, --sort-by-file          sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "      --no-escape             не выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                              вывадзе (звычайна)\n"
+#~ "  -E, --escape                выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ "                              вывадзе, замест дадатковых сымбаляў\n"
+#~ "      --force-po              запісваць PO файл, нават калі парожні\n"
+#~ "      --indent                вывад з водступамі\n"
+#~ "      --keep-header           трымаць загаловак нязьменным, не фільтраваць\n"
+#~ "      --no-location           адкідваць радкі '#: файл:радок'\n"
+#~ "      --add-location          дабаўляць радкі '#: файл:радок' (звычайна)\n"
+#~ "      --strict                вывад жорстка адпаведае Uniforum\n"
+#~ "  -w, --width=ЛІК             усталяваць шырыню вываду\n"
+#~ "      --no-wrap               не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+#~ "\n"
+#~ "                              даўжэй чым шырыня, на некалькі радкоў\n"
+#~ "  -s, --sort-output           ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file          упарадкоўваць вывад па назьве файла\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file location:\n"
+#~ "  filename.po ...             input files\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ "  файл.po ...                 файл уводу\n"
+#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+#~ "                              файлаў\n"
+#~ "Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Operation mode:\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+#~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+#~ msgstr ""
+#~ "Рэжым дзеяньня:\n"
+#~ "  -j, --java                  Java рэжым: ствараць Java ResourceBundle кляс\n"
+#~ "      --java2                 як --java, але ў дачыненьні Java2 (JDK 1.2 ці\n"
+#~ "                              больш позьняя вэрсія)\n"
+#~ "      --tcl                   Tcl рэжым: ствараць tcl/msgcat .msg файл\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location:\n"
+#~ "  -o, --output-file=FILE      write output to specified file\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "If output file is -, output is written to standard output.\n"
+#~ msgstr ""
+#~ "Файл вываду:\n"
+#~ "  -o, --output-file=ФАЙЛ      запісвае вывад у зададзены файл\n"
+#~ "      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
+#~ "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output file location in Tcl mode:\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
+#~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
+#~ "specified directory.\n"
+#~ msgstr ""
+#~ "Файл вываду ў рэжыме Tcl:\n"
+#~ "  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
+#~ "  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя .msg каталёгаў паведамленьняў\n"
+#~ "Выбары -l і -d абавязковыя.  Файл .msg запісваецца ў зададзеную дырэкторыю.\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Input file interpretation:\n"
+#~ "  -c, --check                 perform all the checks implied by\n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          check language dependent format strings\n"
+#~ "      --check-header          verify presence and contents of the header entry\n"
+#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "                                and the --output-file option\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "                                menu items\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ msgstr ""
+#~ "Успрыняцьце файла ўводу:\n"
+#~ "  -c, --check                 perform all the checks implied by\n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          check language dependent format strings\n"
+#~ "      --check-header          verify presence and contents of the header entry\n"
+#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "                                and the --output-file option\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "                                menu items\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
+#~ "  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
+#~ "      --statistics            друкуе статыстыку аб перакладах\n"
+#~ "  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
+
+#, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+
+#, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "памылка запісу ў падпрацэс grep"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -q, --quiet, --silent       suppress progress indicators\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
+#~ "  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
+#~ "  -v, --verbose               павялічыць узровень шматслоўнасьці\n"
+#~ "  -q, --quiet, --silent       забараняць паказальнікі дасягненьняў\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ "      --no-wrap            do not break long message lines, longer than\n"
+#~ "                           the output page width, into several lines\n"
+#~ "  -s, --sort-output        generate sorted output\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape          не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                           вывадзе (звычайна)\n"
+#~ "  -E, --escape             выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
+#~ "                           без дадатковых сімвалаў\n"
+#~ "      --force-po           запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent             запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --strict             запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                           пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ       усталёўваць шырыню вывадзімай старонкі\n"
+#~ "      --no-wrap            не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+#~ "\n"
+#~ "                           даўжэй чым шырыня, на некалькі радкоў\n"
+#~ "  -s, --sort-output        ствараць упарадкаваны вывад\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Informative output:\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -v, --verbose            increase verbosity level\n"
+#~ msgstr ""
+#~ "Інфармацыйны вывад:\n"
+#~ "  -h, --help               адлюстроўвае дапамогу й выходзіць\n"
+#~ "  -V, --version            выводзіць зьвесткі аб версіі й выходзіць\n"
+#~ "  -v, --verbose            павялічыць узровень шматслоўнасьці\n"
+
+#, c-format, no-wrap
+#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Display native language translation of a textual message whose grammatical\n"
+#~ "form depends on a number.\n"
+#~ msgstr ""
+#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
+#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#~ "regular directory, another location can be specified with the environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
+#~ "асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
+
+#, c-format
+#~ msgid "%s: warning: "
+#~ msgstr "%s: увага: "
+
+#, c-format
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#, no-wrap
+#~ msgid ""
+#~ "Language=C/C++ specific options:\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "      --debug                    more detailed formatstring recognition result\n"
+#~ msgstr ""
+#~ "Асаблівасьці для C/C++:\n"
+#~ "  -a, --extract-all              атрымаць усе радкі\n"
+#~ "  -k, --keyword[=СЛОВА]          дадатковае ключавое слова для пошуку (бяз\n"
+#~ "                                 СЛОВА азначае не выкарыстоўваць неабумоўленыя\n"
+#~ "                                 ключавыя словы\n"
+#~ "  -T, --trigraphs                разумець ANSI C трыграфы пры ўводзе\n"
+#~ "      --debug                    больш падрабязны вынік разбору радка\n"
+#~ "                                 фарматаваньня\n"
+
+#, fuzzy, no-wrap
+#~ msgid ""
+#~ "Output details:\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "      --no-wrap                  do not break long message lines, longer than\n"
+#~ "                                 the output page width, into several lines\n"
+#~ "  -s, --sort-output              generate sorted output\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ "  -e, --no-escape                не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ "                                 вывадзе (звычайна)\n"
+#~ "  -E, --escape                   выкарыстоўваць Сі ESC пасьлядоўнасьці ў\n"
+#~ "                                 вывадзе, без дадатковых сымбаляў\n"
+#~ "      --force-po                 запісваць PO-файл, нават калі ён пусты\n"
+#~ "  -i, --indent                   запісваць .po файл, выкарыстоўвываючы водступы\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --strict                   запісваць .po файл, жорстка адпавядаючы\n"
+#~ "                                 пагадненьню Uniforum\n"
+#~ "  -w, --width=ШЫРЫНЯ             вызначыць шырыню старонкі вываду\n"
+#~ "      --no-wrap                  не разбураць доўгія радкі, даўжэйшыя за\n"
+#~ "                                 шырыню старонкі вываду, на некалькі радкоў\n"
+#~ "  -s, --sort-output              ствараць упарадкаваны вывад\n"
+#~ "  -F, --sort-by-file             упарадкаваць вывад па шляху да файла\n"
+#~ "      --omit-header              не запісваць загаловак з `msgid \"\"' запісам\n"
+#~ "      --copyright-holder=STRING  set copyright holder in output\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+
+#~ 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 ""
+#~ "Пусты msgid.  Зарэзэрваваны GNU gettext:\n"
+#~ "gettext(\"\") вяртае загаловак зь\n"
+#~ "метададзенымі, а ня пусты радок.\n"
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index 9dd755a1c..2c5bbe011 100644
--- a/gettext-tools/po/bg.po
+++ b/gettext-tools/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-02 23:19+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -15,26 +15,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "неправилен аргумент %s за %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "двусмислен аргумент %s за %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Правилни аргументи са:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
+msgstr ""
+"не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:339
 #, c-format
@@ -55,201 +57,186 @@ msgstr "не можа да се изтрие временна директори
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "запазване на правата върху %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "грешка при отваряне за четене на %s"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "не можа да се отвори за запис резервно копие %s"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "грешка при четене от %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "грешка при записване в %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "грешка след прочитане на %s"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() пропадна"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "не е намерен компилатор за C#, да се опита при разположен pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "не е намерена виртуална машина за C#, да се опита при разположен pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Неизвестна системна грешка"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "пропадна подпроцес %s"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмислена опция '%s', възможности:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: двусмислена опция '%s'\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опцията '--%s' е без аргументи\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: двусмислена опция '%s', възможности:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: неразпозната опция '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргументи\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: опцията '--%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неразпозната опция '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неразпозната опция '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилна опция -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмислена опция '-W %s'\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опцията '-W %s' е без аргументи\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опцията '-W %s' изисква аргумент\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "неправилен аргумент за \"версия на източник\"за compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неправилен аргумент за \"версия на резултат\" за compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "пропадна създаването на \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "грешка при записване на файл \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "не е намерен компилатор за Java, да се опита с разположен gcj или със задаване на $JAVAC"
+msgstr ""
+"не е намерен компилатор за Java, да се опита с разположен gcj или със "
+"задаване на $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "не е намерена виртуална машина за Java, да се опита с разположен gcj или със задаване на $JAVAC"
+msgstr ""
+"не е намерена виртуална машина за Java, да се опита с разположен gcj или със "
+"задаване на $JAVAC"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s В/И грешка при подпроцес"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "пропадна създаването на клас нишки(threads)"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "пропадна записването към подпроцес %s "
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "пропадна четенето от подпроцес %s "
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "не може да се зададе неблокиран В/И към подпроцес %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "пропадна връзката с подпроцес %s"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "подпроцесът %s приключи с код за изход %d"
@@ -273,13 +260,13 @@ msgstr "подпроцесът %s приключи с код за изход %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "“"
 
@@ -288,64 +275,69 @@ msgstr "“"
 msgid "setting permissions for %s"
 msgstr "задаване на права върху %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "не можа да се създаде канал"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle пропадна"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не можа да се възстанови описанието на файл %d, dup2 пропадна"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "подпроцес %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "подпроцес %s получи пагубен сигнал %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Главния елемент трябва да е <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Главният елемент <%s> не съдържа <%s> елемент"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "За елемента <%s> липсва признак <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "За повече сведения, опитайте '%s --help'.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ЕЗИК ПРАВИЛА]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -360,7 +352,7 @@ msgstr ""
 "мн.ч. за ЕЗИК и се извеждат по начин подходящ за употреба от gettext.\n"
 "Ако не е заден аргумент, то CLDR правилата за мн.ч. се четат от стандартния вход.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -369,27 +361,29 @@ msgstr ""
 "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" опции.\n"
 "Също така за незадължителните аргументи.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  извеждане на правилата за множествено число в CLDR формат\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  извеждане на правилата за множествено число в "
+"CLDR формат\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               извеждане на сведение за версия и изход\n"
@@ -398,27 +392,32 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
 "а за грешки в превода на <dict@fsa-bg.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -427,77 +426,78 @@ msgstr ""
 "Това е свободен програмен продукт: свободни сте да го променяте и разпространявате.\n"
 "Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Дайки Уено"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s не може да се прочете"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "не може да се извлекат правилата за %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "грешка при разбор на CLDR правило"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "допълнителен аргумент %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка при отваряне за четене на \"%s\""
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "указаният формат за аргумент %u, както е в '%s', не съществува за '%s'"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент %u"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Директива номер %u започва с |, но не завършва с |."
@@ -507,56 +507,65 @@ msgstr "Директива номер %u започва с |, но не завъ
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' е неправилен %s форматиращ низ, за разлика от '%s'. Причина: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "При директива номер %u, частта след '<' не е име на форматиращ макрос. Правилните имена на макроси са изброени в ИСО Си 99 дял 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"При директива номер %u, частта след '<' не е име на форматиращ макрос. "
+"Правилните имена на макроси са изброени в ИСО Си 99 дял 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "В директива номер %u, частта след '<' не е завършена с '>'."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "Низът указва към аргумент номер %u, но пренебрегва аргумент номер  %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не съвпада указания брой на формати при '%s' и при '%s'"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "При директива номер %u, '{' не е последван от номер на аргумент."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "При директива номер %u, ',' не е последван от число."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Низът завършва по средата на директивата: намерено '{' без съответен '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Низът завършва по средата на директивата: намерено '{' без съответен '}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Директива номер %u завършва с неправилен знак '%c' вместо '}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Директива номер %u завършва с неправилен знак вместо '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "Низът започва в средата на директива : намерено '}' без съответен '{'."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Низът съдържа самотен '}' след директива номер %u."
@@ -573,13 +582,18 @@ msgstr "При директива номер %u, точност не е разр
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "При директива номер %u, числото за точност трябва да бъде равно на %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "При директива номер %u, указването на точност не е разрешено преди '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"При директива номер %u, указването на точност не е разрешено преди '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -616,93 +630,130 @@ msgid "The string ends in the middle of a directive."
 msgstr "Низът завършва в средата на директива."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Низът указва аргументи и чрез номер на аргумент, и чрез неномерирано задаване на аргумент."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Низът указва аргументи и чрез номер на аргумент, и чрез неномерирано "
+"задаване на аргумент."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "При директива номер %u, аргумент номер 0 не е цяло положително число."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "При директива номер %u, ширината за аргумент номер 0 не е цяло положително число."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"При директива номер %u, ширината за аргумент номер 0 не е цяло положително "
+"число."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "При директива номер %u, точността за аргумент номер 0 не е цяло положително число."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"При директива номер %u, точността за аргумент номер 0 не е цяло положително "
+"число."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "При директива номер %u, знакът '%c' не е валиден за превръщане."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Знакът, който прекратява директива номер %u, не е валиден за превръщане."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Знакът, който прекратява директива номер %u, не е валиден за превръщане."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Низът указва към аргумент с номер %u по несъвместим начин."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "При директива номер %u, низът \"%s\" не е правилен за дата/час."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "При директива номер %u, \"%s\" не е последван от запетая."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "При директива номер %u, низът \"%s\" не е правилен за число."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-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\"."
+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\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "При директива номер %u, избора е без число."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "При директива номер %u, избора съдържа число, което не е последвано от '<', '#' или '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"При директива номер %u, избора съдържа число, което не е последвано от '<', "
+"'#' или '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "указаният формат за аргумент {%u}, както е при '%s', не съществува в '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"указаният формат за аргумент {%u}, както е при '%s', не съществува в '%s'"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент {%u}"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
 msgstr "Низът указва към аргумент номер %u, но пренебрегва аргументи %u и %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "указаният формат за аргументи %u и %u, не съществува за '%s' и само един от аргументите може да бъде пренебрегнат"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"указаният формат за аргументи %u и %u, не съществува за '%s' и само един от "
+"аргументите може да бъде пренебрегнат"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -713,15 +764,27 @@ msgstr "грешка при разбор: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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'."
+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'."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "При директива номер %u, са зададени твърде много параметри, а се очаква най-много%u параметър."
-msgstr[1] "При директива номер %u, са зададени твърде много параметри, а се очаква най-много%u параметри."
+msgid ""
+"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."
+msgstr[0] ""
+"При директива номер %u, са зададени твърде много параметри, а се очаква най-"
+"много%u параметър."
+msgstr[1] ""
+"При директива номер %u, са зададени твърде много параметри, а се очаква най-"
+"много%u параметри."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -751,8 +814,12 @@ msgstr "При директива номер %u, са зададени и @, и
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "При директива номер %u, '~:[' не е последван от две клаузи , разделен от '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"При директива номер %u, '~:[' не е последван от две клаузи , разделен от "
+"'~;'."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -774,14 +841,16 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "указаните формати при '%s' не са подмножество на тези при '%s'"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
 msgstr "При директива номер %u, размерът не е съвместим с превръщането '%c'."
 
 #: src/format-python-brace.c:138
@@ -801,8 +870,11 @@ msgstr "При директива номер %u, с '%c' не може да се
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "При директива номер %u, не са разререни повече влагания при указание за формат."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"При директива номер %u, не са разререни повече влагания при указание за "
+"формат."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -810,8 +882,12 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "При директива номер %u, не е завършено указанието за форматиране."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Низът указва към аргументи и чрез име на аргумент, и чрез безименно указване на аргументи."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Низът указва към аргументи и чрез име на аргумент, и чрез безименно указване "
+"на аргументи."
 
 #: src/format-python.c:354
 #, c-format
@@ -820,112 +896,139 @@ msgstr "Низът указва към аргумент с име '%s' по не
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "указаните формати при '%s' очакват изобразяване, а тази при '%s' очакват последователност"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"указаните формати при '%s' очакват изобразяване, а тази при '%s' очакват "
+"последователност"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "указаните формати при '%s' очакват последователност, а тази при '%s' очакват изобразяване"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"указаните формати при '%s' очакват последователност, а тази при '%s' очакват "
+"изобразяване"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "указаният формат за аргумент '%s', като при '%s', не съществува при '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"указаният формат за аргумент '%s', като при '%s', не съществува при '%s'"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент %s"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' е обикновен низ за формат, но '%s' не е: той съдържа 'L' флаг или аргумент за число с плаваща запетая с двойна точност"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' е обикновен низ за формат, но '%s' не е: той съдържа 'L' флаг или "
+"аргумент за число с плаваща запетая с двойна точност"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Низът указва към променлива от обкръжението, която не е с ASCII име."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Низът указва към променлива от обкръжението, чрез сложен израз в скоби. Това не се поддържа от съображения за сигурност."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Низът указва към променлива от обкръжението, чрез сложен израз в скоби. Това "
+"не се поддържа от съображения за сигурност."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Низът указва към променлива от обкръжението, чиято стойност може да е различна в функции на обвивката."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Низът указва към променлива от обкръжението, чиято стойност може да е "
+"различна в функции на обвивката."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Низът указва към променлива от обкръжението с \"празно\" име"
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "При директива номер %u, знакът '%c' не е цифра между 1 и 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Знакът, който прекратява директива номер %u, не е число между 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Бруно Хаибле"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "твърде много аргументи"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Извежда мрежовото име на машината.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Формати за извеждане:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 кратко мрежово име\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          дълго мрежово име, включващо пълно име на интернет\n"
+"  -f, --fqdn, --long          дълго мрежово име, включващо пълно име на "
+"интернет\n"
 "                                област(domain) и синоними\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси за мрежово име\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Осведомително извеждане:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "не можа да се определи мрежовото име"
@@ -935,7 +1038,7 @@ msgstr "не можа да се определи мрежовото име"
 msgid "selector is not specified"
 msgstr "не е зададено правило за избор"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "не можа да се създаде обкръжение за XPath"
@@ -945,28 +1048,28 @@ msgstr "не можа да се създаде обкръжение за XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "не се изчисли XPath израз: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "\"%s\" възел не съдържа \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "неправилен признак \"%s\" за \"%s\""
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "главния елемент не е \"правило\" в именувано пространство %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "не можа да се прочете %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "не се изчисли XPath местоположение: %s"
@@ -986,28 +1089,28 @@ msgstr "не можа да се прочете XML-файл %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "главния елемент не е правило за местоположение"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "позволява се най-много един входящ файл"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s са взаимоизключващи се"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1016,282 +1119,356 @@ msgstr ""
 "Прецежда съобщенията от каталога с преводи според техните атрибути и \n"
 "обработва атрибутите.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" опции.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" "
+"опции.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Местоположение на входящ файл:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХФАЙЛ                      входящ PO файл\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=ДИР         добавя директория ДИР към списъка за търсене на входящи файлове\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=ДИР         добавя директория ДИР към списъка за търсене "
+"на входящи файлове\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния вход.\n"
+msgstr ""
+"Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния "
+"вход.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Местоположение на резултатата:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=ФАЙЛ      записване на резултата в зададения файл\n"
+msgstr ""
+"  -o, --output-file=ФАЙЛ      записване на резултата в зададения файл\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис или той е -\n"
+msgstr ""
+"Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис "
+"или той е -\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор на съобщения:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            запазване на преведените, изтриване на непреведените съобщения\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            запазване на преведените, изтриване на "
+"непреведените съобщения\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          запазване на непреведените, изтриване на преведените съобщения\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          запазване на непреведените, изтриване на "
+"преведените съобщения\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              изтриване на съобщенията отбелязани като мъгляви('fuzzy')\n"
+msgstr ""
+"      --no-fuzzy              изтриване на съобщенията отбелязани като "
+"мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            запазване на на съобщенията отбелязани като мъгляви('fuzzy')\n"
+msgstr ""
+"      --only-fuzzy            запазване на на съобщенията отбелязани като "
+"мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           изтриване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         запазване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Управление на атрибутите:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             установяване на всички съобщения като мъгляви('fuzzy')\n"
+msgstr ""
+"      --set-fuzzy             установяване на всички съобщения като "
+"мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           установяване на всички съобщения да не са мъгляви('fuzzy')\n"
+msgstr ""
+"      --clear-fuzzy           установяване на всички съобщения да не са "
+"мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          установяване на всички съобщения като остаряли\n"
+msgstr ""
+"      --set-obsolete          установяване на всички съобщения като "
+"остаряли\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        установяване на всички съобщения да не са остаряли\n"
+msgstr ""
+"      --clear-obsolete        установяване на всички съобщения да не са "
+"остаряли\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
 "      --previous              при отбелязване като 'мъгляв', да се запазват\n"
-"                              предишните msgid-та, на преведените съобщения.\n"
+"                              предишните msgid-та, на преведените "
+"съобщения.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        изтрива \"предишния\" msgid от всички съобщения\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        изтрива \"предишния\" msgid от всички "
+"съобщения\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 при изтриване на мъгляви('fuzzy'), да се зададе празен \"msgstr\"\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 при изтриване на мъгляви('fuzzy'), да се "
+"зададе празен \"msgstr\"\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=ФАЙЛ.po     управлява само записите изброени в ФАЙЛ.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=ФАЙЛ.po     управлява само записите изброени в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=ФАЙЛ.po   управлява само записите, които не са изброени в ФАЙЛ.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=ФАЙЛ.po   управлява само записите, които не са изброени "
+"в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синоним за --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              синоним за --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              синоним за --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис на входящия файл:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      входящия файл е със синтаксис на Java .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      входящия файл е със синтаксис на Java ."
+"properties\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     входящия файл е със синтаксис на NeXTstep/GNUstep .низове\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     входящия файл е със синтаксис на NeXTstep/"
+"GNUstep .низове\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробности за извеждане:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
-"      --color                 винаги с използване на цвят и др. атрибути за текст\n"
-"      --color=КОГА            използване на цвят и др. атрибути за текст, ако КОГА.\n"
-"                              КОГА може да бъде 'always', 'never', 'auto', или 'html'.\n"
+"      --color                 винаги с използване на цвят и др. атрибути за "
+"текст\n"
+"      --color=КОГА            използване на цвят и др. атрибути за текст, "
+"ако КОГА.\n"
+"                              КОГА може да бъде 'always', 'never', 'auto', "
+"или 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=СТИЛФАЙЛ        задава CSS правила за --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             без използване на Си освобождаващи последователности в резултата (по подразбиране)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             без използване на Си освобождаващи "
+"последователности в резултата (по подразбиране)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                използване на Си освобождаващи последователности в резултата, без разширени знаци\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                използване на Си освобождаващи "
+"последователности в резултата, без разширени знаци\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              записване на PO файл, дори ако е празен\n"
+msgstr ""
+"      --force-po              записване на PO файл, дори ако е празен\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                записване на .po файл в стил с отмествания\n"
+msgstr ""
+"  -i, --indent                записване на .po файл в стил с отмествания\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           без записване на редове '#: filename:line'\n"
+msgstr ""
+"      --no-location           без записване на редове '#: filename:line'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          създаване на редове '#: filename:line' (по подразбиране)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          създаване на редове '#: filename:line' (по "
+"подразбиране)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                записва строго отговарящ за уеднаквяване .po файл\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                записва строго отговарящ за уеднаквяване .po "
+"файл\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записване на Java .properties файл\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    записване на NeXTstep/GNUstep .strings файл\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    записване на NeXTstep/GNUstep .strings файл\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=ЦЯЛО            установяване на ширината на изходящата страница\n"
+msgstr ""
+"  -w, --width=ЦЯЛО            установяване на ширината на изходящата "
+"страница\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1300,31 +1477,32 @@ msgstr ""
 "      --no-wrap               без разделяне на няколко реда на съобщения,\n"
 "                              по-дълги от ширината на изходящата страница\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           резултатът да е подреден\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          подреждане на резултата по място на файла\n"
+msgstr ""
+"  -F, --sort-by-file          подреждане на резултата по място на файла\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1347,41 +1525,46 @@ msgstr ""
 "ще се натрупат, освен ако е зададено --use-first, като тогава ще се вземат\n"
 "от първия PO файл, който ги определя.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХФАЙЛ ...                  входящи файлове\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=ФАЙЛ       получаване на списъка с входящи файлове от ФАЙЛ\n"
+msgstr ""
+"  -f, --files-from=ФАЙЛ       получаване на списъка с входящи файлове от "
+"ФАЙЛ\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ако входящия файл е -, се чете от стандартния вход.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: 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 ""
-"  -<, --less-than=ЦЯЛО        извежда съобщенията определени по-малко пъти от това\n"
-"                              По-поразбиране безкрайност, ако не е установено\n"
+"  -<, --less-than=ЦЯЛО        извежда съобщенията определени по-малко пъти "
+"от това\n"
+"                              По-поразбиране безкрайност, ако не е "
+"установено\n"
 
-#: src/msgcat.c:411
+#: 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 ""
-"  ->, --more-than=ЦЯЛО        извежда съобщенията определени повече пъти от това\n"
+"  ->, --more-than=ЦЯЛО        извежда съобщенията определени повече пъти от "
+"това\n"
 "                              По-поразбиране 0, ако не е установено\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1390,28 +1573,32 @@ msgstr ""
 "  -u, --unique                съкращения за --less-than=2, поисква се\n"
 "                              извеждане на неповтарящите се съобщения\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      входящите файлове са с Java .properties синтаксис\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      входящите файлове са с Java .properties "
+"синтаксис\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     входящите файлове са с NeXTstep/GNUstep .strings\n"
+"      --stringtable-input     входящите файлове са с NeXTstep/GNUstep ."
+"strings\n"
 "                              синтаксис\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодировка при извеждане\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1420,32 +1607,34 @@ msgstr ""
 "      --use-first             използване на първия наличен превод за всяко\n"
 "                              съобщение, без сливане на отделни преводи\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=ИМЕКАТАЛОГ       задава поле 'Language' за заглавния блок\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=ИМЕКАТАЛОГ       задава поле 'Language' за заглавния блок\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Петер Милер"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "точно 2 входящи файла са необходими"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [ОПЦИЯ] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1462,84 +1651,88 @@ msgstr ""
 "преведени всички съобщения в програмата.  Ако не е намерено точно съвпадение,\n"
 "за получаване на по-добър резултат, се използва размито съвпадение.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      преводи\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     препратки към източници\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Уточняване на операциите:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     да не се използва размито съвпадение\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             да се отчитат мъглявите записи\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      да се отчитат непреведените записи\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "съобщението не е преведено "
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "съобщението трябва да се прегледа от преводача"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "съобщението се използва, но не е определено..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...но определението е подобно"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "съобщението се използва, но не е определено в %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "предупреждение: съобщението не се използва"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "открита е %d пагубна грешка"
 msgstr[1] "открити са %d пагубни грешки"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "най-малко два реда трябва да се зададат"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1560,74 +1753,81 @@ msgstr ""
 "първия PO файл, който ги определя.  От всички PO файлове ще се натрупат\n"
 "местоположенията във файловете.\n"
 
-#: src/msgcomm.c:402
+#: 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 ""
-"  ->, --more-than=ЦЯЛО        извежда съобщенията определени повече пъти от това\n"
+"  ->, --more-than=ЦЯЛО        извежда съобщенията определени повече пъти от "
+"това\n"
 "                              По-поразбиране 1, ако не е установено\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           без записване на заглавен 'msgid \"\"' запис\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           без записване на заглавен 'msgid \"\"' запис\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Преобразува каталог с преводи в различна кодировка за знаци.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Цел за преобразуване:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Кодировка по подразбиране е текущата кодировка на локала.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                резултат в стил с отместване\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           подтискане на редове '#: filename:line'\n"
+msgstr ""
+"      --no-location           подтискане на редове '#: filename:line'\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          запазване на редове '#: файл:ред' (по подразбиране)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          запазване на редове '#: файл:ред' (по "
+"подразбиране)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строг уеднаквен стил за резултат\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "необходим е точно един входящ файл"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЯ] ВХФАЙЛ\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1640,22 +1840,22 @@ msgstr ""
 "създаден от xgettext).  На непреведените записи се присвоява превод,\n"
 "който е еднакъв с msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХФАЙЛ                      входящ PO или POT файл\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "липсва име на команда"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ] КОМАНДА [КОМАНДНА-ОПЦИЯ]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1670,7 +1870,7 @@ msgstr ""
 "данни стават резултат на msgexec.  Върнатия от msgexec код на излизане\n"
 "е най-големият получен при всички  извиквания.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1679,47 +1879,47 @@ msgstr ""
 "Специална вградена команда наречена '0' извежда преводите последвани от \n"
 "<NULL> байт.  Резултата от \"msgexec 0\" е подходящ като входящ за \"xargs -0\".\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Входящо за командата:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   добавяне на нов ред към края на входа\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ PO файл\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "пропадна записването на стандартния изход"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "липсва име на цедка"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "трябва да се зададе най-малко един sed скрипт"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ] ЦЕДКА [ЦЕДКА-ОПЦИЯ]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прилагане на цедка към всички преводи от каталога с преводи.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1728,12 +1928,12 @@ msgstr ""
 "ЦЕДКА може е всяка програма, която чете превод от стандартния вход\n"
 "и записва променения превод на стандартния изход.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Прецеждане на вход и изход:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1742,258 +1942,303 @@ msgstr ""
 "  --newline                   добавя нов ред в края на входа и\n"
 "                                премахва новия ред от края на изхода"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Полезни ЦЕДКА-ОПЦИИ, когато ЦЕДКА е 'sed':\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=СКРИПТ     добавя СКРИПТ към командите за изпълнение\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=СКРИПТ     добавя СКРИПТ към командите за изпълнение\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=СКРИПТФАЙЛ       добавя съдържанието на СКРИПТФАЙЛ към командите\n"
+"  -f, --file=СКРИПТФАЙЛ       добавя съдържанието на СКРИПТФАЙЛ към "
+"командите\n"
 "                                за изпълнение\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       подтискане на автоматичното извеждане на пространството от образи\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       подтискане на автоматичното извеждане на "
+"пространството от образи\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             без използване на Си освобождаващи последователности в резултата (по подразбиране)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             без използване на Си освобождаващи "
+"последователности в резултата (по подразбиране)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                резултат в стил с отместване\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           запазване на заглавни записи без промяна, да не се прецеждрат\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           запазване на заглавни записи без промяна, да "
+"не се прецеждрат\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "прецеденият изход не завършва с знак за нов ред"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумента на %s трябва да е единичен препинателен знак"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправилно име за начин на подреждане на байтове: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "не са задава входящ файл, ако са зададени %s и %s"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s изисква указване на \"-d директория\""
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s изисква указване на \"-l локал\""
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s изисква указване на \"\"--template пример\""
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s изисква указване на \"-o файл\""
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s и %s са взаимоизключващи се при %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s е правилен само с %s, %s или %s"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "за %s не са открити правила за превод"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d преведено съобщение"
 msgstr[1] "%d преведени съобщения"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d мъгляв превод"
 msgstr[1] ", %d мъгляви преводи"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d непреведено съобщение"
 msgstr[1] ", %d непреведени съобщения"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Създаване на двоичен каталог със съобщения от текстово описание на преводите.\n"
+msgstr ""
+"Създаване на двоичен каталог със съобщения от текстово описание на "
+"преводите.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  имефайл.po ...              входящи файлове\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режими на работа:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java режим: създаване на клас за Java "
+"ResourceBundle\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java режим: създаване на клас за Java ResourceBundle\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 като --java и се подразбира Java2 (JDK 1.2 или "
+"по-нова)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 като --java и се подразбира Java2 (JDK 1.2 или по-нова)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                C# режим: създаване на .NET .dll файл\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# режим: създаване на .NET .dll файл\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# ресурс режим: създаване на .NET .resources "
+"файл\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C# ресурс режим: създаване на .NET .resources файл\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl режим: създаване на tcl/msgcat .msg файл\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl режим: създаване на tcl/msgcat .msg файл\n"
-
-#: src/msgfmt.c:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt режим: създаване на Qt .qm файл\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Режим \"Работен плот\": създаване на .desktop файл\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Режим \"Работен плот\": създаване на .desktop "
+"файл\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML режим: създаване на XML файл\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                разрешава стриктен уеднаквен режим\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ако изходящия файл е -, резултатът се записва на стандартния изход.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Местоположение на резултата при Java режим:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име на ресурс\n"
 
-#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=ЛОКАЛ          име на локал, или език, или език_ДЪРЖАВА\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr "      --source                създава .java файл, вместо .class файл\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d ДИРЕКТОРИЯ               основна директория с йерархията на класовете\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d ДИРЕКТОРИЯ               основна директория с йерархията на класовете\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Името на класа се определя като се добави името на локал към името на ресурса,\n"
+"Името на класа се определя като се добави името на локал към името на "
+"ресурса,\n"
 "разделени с долна черта.  Опцията -d е задължителна.  Класът се записва в\n"
 "зададената директория.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Местоположение на резултата при C# режим:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d ДИРЕКТОРИЯ               основна директория за зависими от локал .dll файлове\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d ДИРЕКТОРИЯ               основна директория за зависими от локал .dll "
+"файлове\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2002,17 +2247,19 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .dll файла се записва в поддиректория\n"
 "на указаната, чието име зависи от локала.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Местоположение на резултата при Tcl режим:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d ДИРЕКТОРИЯ               основна директория за каталози с .msg съобщения\n"
+msgstr ""
+"  -d ДИРЕКТОРИЯ               основна директория за каталози с .msg "
+"съобщения\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2021,22 +2268,22 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .msg файла се записва в указаната\n"
 "директория.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Опции за режим \"Работен плот\":\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=ПРИМЕР           .desktop-файл използван като пример\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d ДИРЕКТОРИЯ               основна директория от .po-фаилове\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2045,188 +2292,214 @@ msgstr ""
 "  -kДУМА, --keyword=ДУМА      търсене по ДУМА като допълнителен ключ\n"
 "  -k, --keyword               да не се използва ключ по подразбиране\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Опциите -l, -o, и --template са задължителни.  Ако е зададено -D, то входящите\n"
+"Опциите -l, -o, и --template са задължителни.  Ако е зададено -D, то "
+"входящите\n"
 "файлове се четат от тази директория, вместо от командния ред.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Опции за XML режим:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=ЕЗИК         прилагане на зададения XML език\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=ПРИМЕР           XML-файл използван като пример\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тълкувания за входящия файл:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 изпълняват се всички проверки подразбиращи се от\n"
-"                                --check-format, --check-header, --check-domain\n"
+"  -c, --check                 изпълняват се всички проверки подразбиращи се "
+"от\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          проверка на езиково зависимите форматиращи низове\n"
+msgstr ""
+"      --check-format          проверка на езиково зависимите форматиращи "
+"низове\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          проверка на наличието и съдържанието на заглавни записи\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          проверка на наличието и съдържанието на "
+"заглавни записи\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          проверка за противоречие между директивите за област\n"
+"      --check-domain          проверка за противоречие между директивите за "
+"област\n"
 "                                и опцията --output-file\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   проверка дали ГНУ msgfmt се държи като X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   проверка дали ГНУ msgfmt се държи като X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=ЗНАК]  проверка за наличието на ускорени клавиши\n"
+"      --check-accelerators[=ЗНАК]  проверка за наличието на ускорени "
+"клавиши\n"
 "                                за елементи на меню\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             използване на мъгляви(fuzzy) записи при извеждане\n"
+msgstr ""
+"  -f, --use-fuzzy             използване на мъгляви(fuzzy) записи при "
+"извеждане\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=БРОЙ        подравнява низовете до БРОЙ байтове (по подразбиране: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=БРОЙ        подравнява низовете до БРОЙ байтове (по "
+"подразбиране: %d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=ПОДРБАЙТ   извежда 32-битови числа в зададената подредба на байтове\n"
-"                                (старши или младши, по подразбиране зависи от процесора)\n"
+"      --endianness=ПОДРБАЙТ   извежда 32-битови числа в зададената подредба "
+"на байтове\n"
+"                                (старши или младши, по подразбиране зависи "
+"от процесора)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               двоичният файл няма да съдържа хеш-таблица\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               двоичният файл няма да съдържа хеш-таблица\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            извежда статистика за преводите\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               увеличава нивото на подробност\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "предупреждение: заглавието на PO файла липсва или не е правилно\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "предупреждение: няма да работи превръщането м/у кодировки\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "предупреждение: заглавието на PO файла е мъгляво\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "предупреждение: стари версии на msgfmt ще дадат грешка за това\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "името на област \"%s\" не е подходящо за име на файл"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "името на област  \"%s\" не е подходящо за име на файл: ще се използва представка"
+msgstr ""
+"името на област  \"%s\" не е подходящо за име на файл: ще се използва "
+"представка"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "пренебрегната директива 'област %s'"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "пренебрегнат празен 'msgstr' запис"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не съществува"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s съществува, но е нечетим"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при четене на \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "опцията '%c' не може да се използва преди да се зададе 'J', 'K', 'T', 'C', или 'X'"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"опцията '%c' не може да се използва преди да се зададе 'J', 'K', 'T', 'C', "
+"или 'X'"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2235,7 +2508,7 @@ msgstr ""
 "Извличане на всички съобщения от каталога с преводи, които съвпадат с даден образ\n"
 "или принадлежат на дадени файлове източници.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2310,32 +2583,42 @@ msgstr ""
 "  -v, --invert-match          извеждане на съобщенията, които не съвпадат със никой\n"
 "                              от критериите за избор\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                резултат с използване на Си освобождаващи последователности, без разширени знаци\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                резултат с използване на Си освобождаващи "
+"последователности, без разширени знаци\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           резултатът да е подреден\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          подреждане на резултата по място на файла\n"
-
-#: src/msginit.c:298
+msgstr ""
+"      --sort-by-file          подреждане на резултата по място на файла\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Използва се езиково неутрално обкръжение.  Да се зададе променливата\n"
 "от обкръжението LANG, като е описано в файла ABOUT-NLS.  Това е\n"
 "необходимо, за да се тества превода.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2346,12 +2629,12 @@ msgstr ""
 "Да се зададе локал, чрез опцията --locale или .po файл за резултат, \n"
 "чрез опцията --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Създаден %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2360,26 +2643,28 @@ msgstr ""
 "Създаване на нов PO файл, запълвайки метаинформацията със стойности\n"
 "от потребителското обкръжение.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ POT файл\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Ако не е зададен входящ файл, текущата директория се претърсва за POT файл.\n"
 "Ако той е -, се чете от стандартния вход.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=ФАЙЛ      записване на резултата в указания PO файл\n"
+msgstr ""
+"  -o, --output-file=ФАЙЛ      записване на резултата в указания PO файл\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2389,17 +2674,20 @@ msgstr ""
 "потребителските настройки за локал.  Ако той е -, резултатът се извежда на\n"
 "стандартния изход.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          задаване на целевия локал\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         приема се, че PO файла се създава автоматично\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         приема се, че PO файла се създава автоматично\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2407,12 +2695,12 @@ msgstr ""
 "Намерен е повече от един .pot файл.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка при четене на текущата директория"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2420,84 +2708,97 @@ msgstr ""
 "Не е намерен .pot файл в текущата директория.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "пропадна подпроцесът %s и той излезе с код %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Новият каталог със съобщения трябва да съдържа вашия адрес за е-поща, така че\n"
-"потребителите да могат да ви върнат отговори относно превода и също така, за да\n"
-"може поддръжката да се свърже с вас в случай на неочаквани технически проблеми.\n"
+"Новият каталог със съобщения трябва да съдържа вашия адрес за е-поща, така "
+"че\n"
+"потребителите да могат да ви върнат отговори относно превода и също така, за "
+"да\n"
+"може поддръжката да се свърже с вас в случай на неочаквани технически "
+"проблеми.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Български превод за пакет %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "входящия файл е с две различни кодировки - \"%s\" и \"%s\""
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "входящия файл '%s', не съдържа заглавен запис с указание за кодировка"
 
-#: src/msgl-cat.c:208
+#: 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 "областта \"%s\", във входящия файл '%s', не съдържа заглавен запис за указаване на кодировка"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"областта \"%s\", във входящия файл '%s', не съдържа заглавен запис за "
+"указаване на кодировка"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "целевата кодировка, \"%s\", не е с преносимо име"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Входящите файлове съдържат съобщения с различни кодировки и UTF-8 е между тях.\n"
+"Входящите файлове съдържат съобщения с различни кодировки и UTF-8 е между "
+"тях.\n"
 "Преобразуване на резултата в UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2507,10 +2808,11 @@ msgid ""
 msgstr ""
 "Преобразуването на файла %s от кодировка %s към кодировка %s промени някои\n"
 "msgids или msgctxts.\n"
-"Или да се променят всички msgids и msgctxts да са в ASCII или да се осигури,\n"
+"Или да се променят всички msgids и msgctxts да са в ASCII или да се "
+"осигури,\n"
 "да са кодирани в UTF-8 поначало, т.е. във файловете с програмен код.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2523,12 +2825,12 @@ msgstr ""
 "Резултата на '%s' може да не е правилен.\n"
 "Възможни заобикаляния са:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2539,7 +2841,7 @@ msgstr ""
 "  после прилагане на '%s',\n"
 "  после обратно преобразуване, използвайки 'msgconv', към %s.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2552,7 +2854,7 @@ msgstr ""
 "  после прилагане на '%s',\n"
 "  после обратно преобразуване, използвайки 'msgconv', към %s.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2570,7 +2872,9 @@ msgstr "израза за множествено число може да вър
 #: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu, но израза за множествено число може да върне стойност по-голяма от %lu"
+msgstr ""
+"nplurals = %lu, но израза за множествено число може да върне стойност по-"
+"голяма от %lu"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
@@ -2581,8 +2885,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "в израза за множествено число може да получи целочислено препълване"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "в израза за множествено число може да се получи аритметична грешка, възможно е деление на нула"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"в израза за множествено число може да се получи аритметична грешка, възможно "
+"е деление на нула"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2629,10 +2937,14 @@ msgstr[0] "но някой съобщения съдържат една форм
 msgstr[1] "но някой съобщения съдържат %lu форми за множествено число"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "каталогът със съобщения съдържа форми за множествено число, но липсва заглавен запис с \"Plural-Forms: nplurals=ЦЯЛО; plural=ИЗРАЗ;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"каталогът със съобщения съдържа форми за множествено число, но липсва "
+"заглавен запис с \"Plural-Forms: nplurals=ЦЯЛО; plural=ИЗРАЗ;\""
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "и двата записа, 'msgid' и 'msgid_plural', не започват с '\\n'"
 
@@ -2641,11 +2953,11 @@ msgstr "и двата записа, 'msgid' и 'msgid_plural', не започв
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "и двата записа, 'msgid' и 'msgstr[%u]', не започват с '\\n'"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "и двата записа, 'msgid' и '`msgstr', не започват с '\\n'"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "и двата записа, 'msgid' и 'msgid_plural', не завършват с '\\n'"
 
@@ -2654,11 +2966,11 @@ msgstr "и двата записа, 'msgid' и 'msgid_plural', не завърш
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "и двата записа, 'msgid' и 'msgstr[%u]', не завършват с '\\n'"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "и двата записа, 'msgid' и 'msgstr', не завършват с '\\n'"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "поддръжката на множествено число е допълнение на ГНУ gettext"
 
@@ -2688,17 +3000,18 @@ msgstr "ASCII многоточие ('...') вместо уникод"
 
 #: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr "във видим за потребителите низ е намерено знак за празно преди многоточието"
+msgstr ""
+"във видим за потребителите низ е намерено знак за празно преди многоточието"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "използвана е двойна кавичка в ASCII вместо в уникод"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "използвана е единична кавичка в ASCII вместо в уникод"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "ASCII отметка ('%c') вместо уникод"
@@ -2713,37 +3026,49 @@ msgstr "%s: входящите данни не са с кодировка \"%s\"
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: грешка при преобразуване от кодировка \"%s\" към кодировка \"%s\""
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "входящия файл не съдържа запис указващ кодировка"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(), а iconv() не поддържа това превръщане."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(), а iconv() "
+"не поддържа това превръщане."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Превръщането от \"%s\" към \"%s\" създаде повторения: някой различни msgids се получиха еднакви."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Превръщането от \"%s\" към \"%s\" създаде повторения: някой различни msgids "
+"се получиха еднакви."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s е правилно само с %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "тип на резервно копие"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2767,26 +3092,28 @@ msgstr ""
 "съвпадение, за получаван на по-добри резултати ще се използват размити\n"
 "(fuzzy) съвпадения\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      преводи препращащи към на старите източници\n"
+msgstr ""
+"  def.po                      преводи препращащи към на старите източници\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     препратки към новите източници\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=ФАЙЛ       допълнителна библиотека с преведени съобщения,\n"
+"  -C, --compendium=ФАЙЛ       допълнителна библиотека с преведени "
+"съобщения,\n"
 "                              може да се укаже повече от веднъж\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2795,30 +3122,31 @@ msgstr ""
 "  -U, --update                обнови def.po,\n"
 "                              не прави нищо, ако def.po е осъвременен\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Място на изходящия файл при обновяване:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Резултата се записва обратно в def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛ        създаване на резервно копие на def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=НАСТ           задава наставка за резервно копие\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2832,106 +3160,136 @@ msgstr ""
 "  existing, nil   номериран, ако съществува такъв, иначе обикновен\n"
 "  simple, never   винаги се създава обикновено резервно копие\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Наставката за резервно копие е `~', освен ако е зададена с --suffix или с\n"
 "променливата на обкръжението SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 разпознава Boost формат за низове\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              запазване на предишните msgid-ита на преведените съобщения\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              запазване на предишните msgid-ита на "
+"преведените съобщения\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
+msgstr ""
+"  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "това съобщение трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "това съобщение не трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sПрочетени %ld стари + %ld препратки, сляти %ld, мъгляви %ld, липсващи %ld, остаряли %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sПрочетени %ld стари + %ld препратки, сляти %ld, мъгляви %ld, липсващи %ld, "
+"остаряли %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " готово.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Преобразува каталог с двоични съобщения в .po файл каталог с уеднаквен стил.\n"
+msgstr ""
+"Преобразува каталог с двоични съобщения в .po файл каталог с уеднаквен "
+"стил.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java режим: входящ е клас за Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java режим: входящ е клас за Java "
+"ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C# ресурсен режим: входящ е .NET .resources файл\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# ресурсен режим: входящ е .NET .resources "
+"файл\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl режим: входящ е tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ФАЙЛ ...                    входящи .mo файлове\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Местоположение на входящите файлове при Java режим:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Името на класа се определя като се добави име на локал към името на ресурса,\n"
+"Името на класа се определя като се добави име на локал към името на "
+"ресурса,\n"
 "разделени с долна черта.  Класът се намира използвайки CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Местоположение на входящия файл при C# режим:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2940,12 +3298,12 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .dll файла се намира в\n"
 "поддиректория на указаната, чието име зависи от локала.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Местоположение на входящия файл при Tcl режим:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2954,17 +3312,18 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .msg файла се намира в\n"
 "указаната директория.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                записване на резултата в стил с отмествания\n"
+msgstr ""
+"  -i, --indent                записване на резултата в стил с отмествания\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                записване в стриктен уеднаквен стил\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2985,17 +3344,21 @@ msgstr ""
 "като тогава ще се вземат от първия превод. Позициите във файловете ще се натрупат.\n"
 "Ако се използва --unique, повторенията ще се отхвърлят.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              извежда само повторенията\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                извежда само неповтарящи се съобщения, отхвърляне на повторения\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                извежда само неповтарящи се съобщения, "
+"отхвърляне на повторения\n"
 
-#: src/open-catalog.c:57 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 "<стандвх>"
@@ -3007,7 +3370,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Кодовото множество, \"%s\", не е с преносимо име за кодировка.\n"
-"Преобразуването на съобщенията към потребителското кодовото множество може да не работи.\n"
+"Преобразуването на съобщенията към потребителското кодовото множество може "
+"да не работи.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -3023,7 +3387,8 @@ msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Разполагането на ГНУ libiconv и след това повторното разполагане на ГНУ gettext\n"
+"Разполагането на ГНУ libiconv и след това повторното разполагане на ГНУ "
+"gettext\n"
 "ще оправи този проблем.\n"
 
 #: src/po-charset.c:578 src/po-charset.c:616
@@ -3056,27 +3421,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "противоречиво използване на #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "липсва дял 'msgstr[]'"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "липсва дял 'msgid_plural'"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "липсва дял 'msgstr'"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "първата форма за множествено число не е с нулев индекс"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "формата за множествено число с грешен индекс"
@@ -3086,7 +3451,7 @@ msgstr "формата за множествено число с грешен и
 msgid "too many errors, aborting"
 msgstr "твърде много грешки, прекратяване"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неправилно многобайтова последователност"
@@ -3096,41 +3461,41 @@ msgstr "неправилно многобайтова последователн
 msgid "incomplete multibyte sequence at end of file"
 msgstr "незавършена многобайтова последователност в края на файла"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "незавършена многобайтова последователност в края на реда"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "неуспех на iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "непознат ключ \"%s\""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "неправилна контролна последователност"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "край-на-файл в низ"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "край-на-ред в низ"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "разделител на съдържание <EOT> в низ"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "този файл май не съдържа директиви за област"
@@ -3160,7 +3525,7 @@ msgstr "липсва '=' след \"%s\""
 msgid "invalid non-blank line"
 msgstr "неправилна значеща линия"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файлът \"%s\" е отрязан"
@@ -3170,29 +3535,45 @@ msgstr "файлът \"%s\" е отрязан"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файлът \"%s\" съдържа низ не завършващ на NUL"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "файлът \"%s\" съдържа низ не завършващ на NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файла \"%s\" не е в ГНУ .mo формат"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файла \"%s\" съдържа незавършващ с NUL низ на позиция %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "предупреждение: неправилен \\uxxxx синтаксис за знак в уникод"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: предупреждение: самотен заместител U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "предупреждение: неправилен знак на Uникод"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "предупреждение: незавършен низ"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "предупреждение: синтактична грешка"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "предупреждение: незавършена двойка ключ/стойност"
 
@@ -3200,11 +3581,11 @@ msgstr "предупреждение: незавършена двойка клю
 msgid "warning: syntax error, expected ';' after string"
 msgstr "предупреждение: синтактична грешка, очаква се ';' след низа"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "предупреждение: синтактична грешка, очаква се '=' или ';' след низа"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Създадена от %s и %s.\n"
@@ -3213,16 +3594,16 @@ msgstr "Създадена от %s и %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Данило Сеган"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Прекодира сръбски текст от кирилица на латиница.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3231,27 +3612,27 @@ msgstr ""
 "Входящия текст се чете от стандартния вход.  Преобразувания текст се извежда\n"
 "на стандартния изход.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "входните данни не са правилни при кодировка \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка при преобразуване от кодировка \"%s\" към кодировка \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "очакват се два аргумента"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Употреба: %s [ОПЦИЯ] АДРЕС ФАЙЛ\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3260,111 +3641,139 @@ msgstr ""
 "Донася и извежда съдържанието на URL. Ако URL не е достъпен, то се използва\n"
 "достъпен локално ФАЙЛ\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "грешка при четене \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "грешка за записване на стандартния изход"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "грешка след прочитане на \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Получава %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " просрочка.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " пропадна.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "При указаният формат, в един файл не може да се получи резултат с много области за превод. В замяна да се опита със синтаксис на PO файл."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"При указаният формат, в един файл не може да се получи резултат с много "
+"области за превод. В замяна да се опита със синтаксис на PO файл."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "При указаният формат, в един файл не може да се получи резултат с много области за превод."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"При указаният формат, в един файл не може да се получи резултат с много "
+"области за превод."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "каталогът със съобщенията съдържа преводи в зависимост от текста, но формата за резултат не ги поддържа."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"каталогът със съобщенията съдържа преводи в зависимост от текста, но формата "
+"за резултат не ги поддържа."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "каталогът със съобщенията съдържа преводи в множествено число, но формата за резултат не ги поддържа. Да се опита създаване на клас за Java, използвайки \"msgfmt --java\", в замяна на .properties файл."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"каталогът със съобщенията съдържа преводи в множествено число, но формата за "
+"резултат не ги поддържа. Да се опита създаване на клас за Java, използвайки "
+"\"msgfmt --java\", в замяна на .properties файл."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "каталогът със съобщенията съдържа преводи в множествено число, но формата за резултат не ги поддържа."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"каталогът със съобщенията съдържа преводи в множествено число, но формата за "
+"резултат не ги поддържа."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не можа да се създаде изходящия файл \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "стандартен изход"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "пропадна създаването на директория \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "пропадна компилирането на клас на C#, да се опита --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "пропадна компилирането на клас на C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка при отваряне на \"%s\" за запис"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "неправилно име за клас на Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "пропадна компилирането на клас на Java, да се опита --verbose или да се установи $JAVAC"
+msgstr ""
+"пропадна компилирането на клас на Java, да се опита --verbose или да се "
+"установи $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "пропадна компилирането на клас на Java, да се опита с установяване $JAVAC"
+msgstr ""
+"пропадна компилирането на клас на Java, да се опита с установяване $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "непълна многобайтова последователност"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "съобщения за превод не трябва да съдържат освобождаваща последователност '\\%c'"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"съобщения за превод не трябва да съдържат освобождаваща последователност '\\"
+"%c'"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3377,7 +3786,7 @@ msgstr ""
 "кодировка. Да се обмисли използването на чисто ASCII msgid.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3400,7 +3809,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3418,12 +3828,12 @@ msgstr ""
 "но формата на Qt каталог със съобщения поддържа уникод само за\n"
 "преведените низове, не не и за непреведените\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "грешка при запис към подпроцес %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3432,7 +3842,7 @@ msgstr ""
 "но формата на C# .resources не ги поддържа\n"
 "но не се поддържат от C# .resources\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3440,7 +3850,7 @@ msgstr ""
 "каталогът със съобщенията съдържа преводи в множествено число,\n"
 "но не се поддържат от C# .resources\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3448,7 +3858,7 @@ msgstr ""
 "каталогът със съобщенията съдържа преводи в зависимост от текста,\n"
 "но не се поддържат от Tcl каталог със съобщения\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3456,36 +3866,56 @@ msgstr ""
 "каталогът със съобщенията съдържа преводи в множествено число,\n"
 "но те не се поддържат от Tcl каталог със съобщения\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: предупреждение: незавършен низ"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: предупреждение: незавършен регулярен израз"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "предупреждение: неправилен знак на Uникод"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: предупреждение: неправилен знак на уникод"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: предупреждение: незавършен заместител на низ"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: предупреждение: незавършен заместител на низ"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: предупреждение: незавършен заместител на низ"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: предупреждение: незавършена константа за буква"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавършен заместител на низ"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Да се зададе кодировка на източника чрез --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3494,7 +3924,7 @@ msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3503,7 +3933,7 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3512,7 +3942,7 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност в края на файла.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3521,12 +3951,12 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност в края на реда.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: неуспех на iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3535,119 +3965,148 @@ msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: предупреждение: неправилен знак на уникод"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: предупреждение: незавършена низова константа"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: предупреждение: намерено е ')', където се очаква'}'"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: предупреждение: намерено е '}', където се очаква ')'"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "'%s' не е правилно име на кодировка.  Използване на ASCII по подразбиране.\n"
+msgstr ""
+"'%s' не е правилно име на кодировка.  Използване на ASCII по подразбиране.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "непозната проверка '%s' на синтаксис"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "непознат край '%s' на изречение"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-existing не може да се използва, когато резултата се записва на стандартния изход"
+msgstr ""
+"--join-existing не може да се използва, когато резултата се записва на "
+"стандартния изход"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да работи без ключове за търсене"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "предупреждение: не съществува ITS-файл с правила - '%s'"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "предупреждение: не съществува ITS-файл с правила - '%s', проверете разполагането на gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"предупреждение: не съществува ITS-файл с правила - '%s', проверете "
+"разполагането на gettext"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
+msgstr ""
+"предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извличане на низовете за превод от зададените входящи файлове.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, 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"
+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:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
+msgstr ""
+"  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=ДИР        изходящите файлове да се запишат в директория ДИР\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=ДИР        изходящите файлове да се запишат в директория "
+"ДИР\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избиране на език на входящия файл:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=ИМЕ          приемане на указания език\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua)\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   за краткост на --language=C++\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "По подразбиране езикът се отгатва в зависимост от окончанието на входящия файл.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"По подразбиране езикът се отгатва в зависимост от окончанието на входящия "
+"файл.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3656,27 +4115,29 @@ msgstr ""
 "      --from-code=NAME        кодиране на входящите файлове\n"
 "                                (без Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "По подразбиране входящите файлове са в ASCII.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         добавя съобщенията към съществуващ файл\n"
+msgstr ""
+"  -j, --join-existing         добавя съобщенията към съществуващ файл\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, 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:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cБЕЛЕГ, --add-comments=БЕЛЕГ в резултата се поставя блок с коментар\n"
@@ -3684,7 +4145,7 @@ msgstr ""
 "  -c, --add-comments            в резултата се поставят всички блокове с\n"
 "                                коментар от редовете преди ключа\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3695,7 +4156,7 @@ msgstr ""
 "                                (многоточие-уникод, празно-многоточие,\n"
 "                                 кавичка-уникод, отметка-уникод)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3703,250 +4164,202 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 "      --sentence-end=ВИД      задава края на изречението\n"
-"                                (единократно празно, което е подразбиращо се, \n"
+"                                (единократно празно, което е подразбиращо "
+"се, \n"
 "                                 или друкратно празно)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Опции за определен език:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извличане на всички низове\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (само езиците  C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (само езиците  C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=ДУМА:АРГ:ФЛАГ    допълнителен флаг за низове при номер на\n"
 "                              аргумент АРГ за ключ ДУМА\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (само езиците C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             разпознаване на ANSI Си тризнаци в входните данни\n"
+msgstr ""
+"  -T, --trigraphs             разпознаване на ANSI Си тризнаци в входните "
+"данни\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (само езици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=ФАЙЛ              прилагане на ITS-правила от ФАЙЛ\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (само езици въз основа на XML)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    разпознава Qt формат за низове\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (само език C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   разпознава KDE 4 формат за низове\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 разпознава Boost формат за низове\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 по-подробен резултат как е разпознато съобщението като вид формат\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 по-подробен резултат как е разпознато "
+"съобщението като вид формат\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     записва Java .properties файл\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               записване на itstool бележки\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=НИЗ     задава носител на авторско право в резултата\n"
+msgstr ""
+"      --copyright-holder=НИЗ     задава носител на авторско право в "
+"резултата\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          резултат без авторско право на ФСС за\n"
 "                              чуждестранни потребители\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=ПАКЕТ    задава име на пакет в резултата\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=ВЕРСИЯ   задава версия на пакета в резултата\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=ПОЩА@АДРЕС     задава адрес за рапортуване на грешки при msgid\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=ПОЩА@АДРЕС     задава адрес за рапортуване на "
+"грешки при msgid\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[НИЗ], --msgstr-prefix[=НИЗ]        използва НИЗ или \"\" като представка за\n"
+"  -m[НИЗ], --msgstr-prefix[=НИЗ]        използва НИЗ или \"\" като "
+"представка за\n"
 "                                стойностите на msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[НИЗ], --msgstr-suffix[=НИЗ]        използва НИЗ или \"\" като наставка за\n"
+"  -M[НИЗ], --msgstr-suffix[=НИЗ]        използва НИЗ или \"\" като наставка "
+"за\n"
 "                                стойности на msgstr\n"
 
-#: src/xgettext.c:2040
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr "Аргумента --flag не е с <ключ>:<ном_арг>:[pass-]<флаг> синтаксис: %s"
 
-#: src/xgettext.c:2165
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "стандартен изход"
 
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Знак извън ASCII кодиране при %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Коментар, който е извън ASCII кодиране, при или преди %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Низ извън ASCII кодиране при %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: предупреждение: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Макар че е използван в място за низове за формат, %s не е правилен низ за %s формат. Причина: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"низ за '%s' формат с безимени аргументи не може да се преведе като трябва:\n"
-"Преводачите не могат да пренареждат аргументите.\n"
-"Да се обмисли използването на низ за формат с именувани аргументи и \n"
-"привързване, вместо последователност за аргументите.\n"
-
-#: src/xgettext.c:2545
-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 ""
-"Празен msgid.  Това е запазено за ГНУ gettext:\n"
-"gettext(\"\") връща заглавен запис с метаинформация,\n"
-"а не празен низ.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "двусмислено зададен аргумент за ключ '%.*s'"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "предупреждение: липсва съдържание за ключ '%.*s'"
-
-#: src/xgettext.c:3334
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "предупреждение: липсва съдържание за множествено число на ключ '%.*s'"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "Несъответствие на съдържание м/у единствено и множествено число"
-
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3958,21 +4371,16 @@ msgstr ""
 "MSGID_BUGS_ADDRESS променлива, иначе се задава\n"
 ", на командния ред, опция --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "непознат език '%s'"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: предупреждение: самотен заместител U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Да се зададе кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3981,7 +4389,7 @@ msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3990,7 +4398,7 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3999,7 +4407,7 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност в края на файла.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4008,7 +4416,7 @@ msgstr ""
 "%s:%d: Непълна многобайтова последователност в края на реда.\n"
 "Да се зададе правилна кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4017,145 +4425,198 @@ msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе кодировка на източника чрез --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: предупреждение: %s не е допустим"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: предупреждение: незавършено XML изразяване"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: не може да се намери ограничител за край на низ \"%s\" до края на файла"
+msgstr ""
+"%s:%d: не може да се намери ограничител за край на низ \"%s\" до края на "
+"файла"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: липсва дясна скоба за \\x{ШЕСТНАДЕСЕТИЧНО}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\l\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\u\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неправилно вмъкване на променлива при \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\L\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\U\") на 8-битова буква \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Да се зададе кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Незавършена многобайтова последователност.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Незавършена многобайтова последователност в края на файла.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Непълна многобайтова последователност в края на реда.\n"
 "Да се зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неправилна многобайтова последователност.\n"
 "Да се зададе кодиране на източника чрез --from-code или чрез коментар,\n"
 "като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Неизвестно кодиране \"%s\". Продължаване на работата с ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправилен определение за низ"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: липсва число след #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправилен израз от тип низ"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: неправилен определение за низ"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: неправилен определение за низ"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за сигурност, вместо това да се използва eval_gettext"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за "
+"сигурност, вместо това да се използва eval_gettext"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
@@ -4286,5 +4747,104 @@ msgstr "в бележка или изнстикция за обработка"
 msgid "document ended unexpectedly: %s"
 msgstr "документа завърши неочаквано: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: опцията '--%s' е без аргументи\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: неразпозната опция '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: двусмислена опция '-W %s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: опцията '-W %s' е без аргументи\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: опцията '-W %s' изисква аргумент\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "предупреждение: заглавието на PO файла е мъгляво\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "предупреждение: стари версии на msgfmt ще дадат грешка за това\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Знак извън ASCII кодиране при %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Коментар, който е извън ASCII кодиране, при или преди %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Низ извън ASCII кодиране при %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: предупреждение: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Макар че е използван в място за низове за формат, %s не е правилен низ за "
+#~ "%s формат. Причина: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: "
+#~ "%s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "низ за '%s' формат с безимени аргументи не може да се преведе като "
+#~ "трябва:\n"
+#~ "Преводачите не могат да пренареждат аргументите.\n"
+#~ "Да се обмисли използването на низ за формат с именувани аргументи и \n"
+#~ "привързване, вместо последователност за аргументите.\n"
+
+#~ 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 ""
+#~ "Празен msgid.  Това е запазено за ГНУ gettext:\n"
+#~ "gettext(\"\") връща заглавен запис с метаинформация,\n"
+#~ "а не празен низ.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "двусмислено зададен аргумент за ключ '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "предупреждение: липсва съдържание за ключ '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "предупреждение: липсва съдържание за множествено число на ключ '%.*s'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "Несъответствие на съдържание м/у единствено и множествено число"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
 #~ msgstr "Главният елемент <%s> не е разрешен в правилен CLDR файл"
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index b15e1fe6f..3d5283784 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -1,8 +1,8 @@
 # Catalan messages for GNU gettext-tools.
-# Copyright (C) 2001, 2002, 2003, 2007, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2007, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 #
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2013, 2014, 2015.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2013, 2014, 2015, 2016, 2017.
 #
 # Sóc Ivan, aquestes són les convencions que adopte per a la 0.19-rc1:
 #
@@ -50,38 +50,41 @@
 # options).  Also strings used in multiline error and warning messages.  ivb
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.4.73\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2015-06-25 19:19+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-08-05 23:21+0200\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"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # Usa quote() en les 2.  ivb
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "l’argument %s no és vàlid per a %s"
 
 # Usa quote() en les 2.  ivb
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "l’argument %s és ambigu per a %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Els arguments vàlids són:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "no s’ha trobat un directori temporal, proveu d’establir la variable d’entorn TMPDIR"
+msgstr ""
+"no s’ha trobat un directori temporal, proveu d’establir la variable d’entorn "
+"TMPDIR"
 
 # No usa quote().  ivb
 #: gnulib-lib/clean-temp.c:339
@@ -106,207 +109,192 @@ msgid "write error"
 msgstr "error d’escriptura"
 
 # Condició d’error.  Usa quote().  ivb
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "en preservar els permissos de %s"
 
 # Usa quote().  ivb
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "error en obrir %s per a llegir"
 
 # Usa quote().  ivb
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, 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"
 
 # Usa quote().  ivb
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
 # Usa quote().  ivb
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "error en escriure %s"
 
 # Usa quote().  ivb
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, 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:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232 src/msginit.c:1397
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "ha fallat fdopen()"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "no s’ha trobat cap compil·lador de C#, instal·leu «pnet»"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "no s’ha trobat cap màquina virtual de C#, instal·leu «pnet»"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "el subprocés «%s» ha fallat"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: l’opció «%c%s» no és reconeguda\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: l’opció «%c%s» no admet arguments\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: l’opció «--%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: l’opció «--%s» no és reconeguda\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: l’opció «%c%s» no és reconeguda\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l’opció «-W %s» és ambígua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l’opció «-W %s» necessita un argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "l’argument «source_version» passat a compile_java_class() no és vàlid"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "no s’ha pogut crear «%s»"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-java.c:1157 src/write-java.c:1198
-#: src/write-mo.c:812 src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error en escriure el fitxer «%s»"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu la variable d’entorn JAVAC"
+msgstr ""
+"no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu la "
+"variable d’entorn JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "no s’ha trobat cap màquina virtual de Java, instal·leu «gij» o establiu la variable d’entorn JAVA"
+msgstr ""
+"no s’ha trobat cap màquina virtual de Java, instal·leu «gij» o establiu la "
+"variable d’entorn JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141 src/msginit.c:1405
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error d’E/S amb el subprocés «%s»"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/format-kde-kuit.c:239 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 src/x-glade.c:549
-#: libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "la creació de fils ha fallat"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "no s’ha pogut escriure al subprocés «%s»"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "no s’ha pogut llegir del subprocés «%s»"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, 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»"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "la comunicació amb el subprocés «%s» ha fallat"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
@@ -330,13 +318,13 @@ msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "»"
 
@@ -346,133 +334,315 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "en establir els permissos de %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "no s’ha pogut crear una canonada"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ha fallat _open_osfhandle()"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "no s’ha pogut restaurar el descriptor %d: ha fallat dup2()"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocés «%s»"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217 src/xgettext.c:2036
-#: src/xgettext.c:2049 src/xgettext.c:2059
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error en obrir «%s» per a llegir"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-# ivb (2002/12/16)
-# 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:152
+#: src/cldr-plurals.c:69
 #, 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 «%s».  Motiu: %s"
+msgid "The root element must be <%s>"
+msgstr "l’element arrel ha de ser «%s»"
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "l’element «%s» no conté un element «%s»"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr "l’element «%s» no té l’atribut «%s»"
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Proveu «%s --help» per a obtenir més informació.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Forma d’ús: %s [OPCIÓ…] [LOCALE REGLES]…\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+"Extrau o converteix regles de plural CLDR d’Unicode.\n"
+"\n"
+"Si s’especifiquen tant LOCALE com REGLES, llig del fitxer REGLES les regles de\n"
+"plural CLDR per al LOCALE i les mostra en un format adequat per a l’ús amb\n"
+"«gettext».  Si no s’indica cap argument, llig les regles de plural CLDR de\n"
+"l’entrada estàndard.\n"
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+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/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -c, --cldr           Mostra les regles de plural en format CLDR.\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"GPLv3+: llicència GNU GPL ver. 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
+"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/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrit per %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr "Daiki Ueno"
+
+# No empra quote().  Nom de fitxer.  ivb
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr "no s’ha pogut llegir «%s»"
+
+# Condició d’error.  No empra quote().  Nom de locale.  ivb
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr "no s’han pogut extreure les regles per a «%s»"
+
+# Condició d’error.  ivb
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr "no s’ha pogut interpretar la regla CLDR"
+
+# No empra quote().  ivb
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr "sobra l’operand «%s»"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
-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 «%3$s»"
+msgid "error while opening \"%s\" for reading"
+msgstr "error en obrir «%s» per a llegir"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgstr ""
+"no existeix, com en «%2$s», una especificació de format de l’argument %1$u "
+"en «%3$s»"
+
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "les especificacions de format en «%s» i «%s» de l’argument %u no són les mateixes"
+msgstr ""
+"les especificacions de format en «%s» i «%s» de l’argument %u no són les "
+"mateixes"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "La directiva número %u comença amb «|» però no acaba en «|»."
 
-#: src/format-c.c:37
+# ivb (2002/12/16)
+# 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:152
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "A la directiva número %u, el component que segueix «<» no és el nom d’una macro d’especificació de format.  Els noms vàlids de macro es troben llistats en ISO C 99, secció 7.8.1."
+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 «%s».  Motiu: %s"
 
-#: src/format-c.c:40
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"A la directiva número %u, el component que segueix «<» no és el nom d’una "
+"macro d’especificació de format.  Els noms vàlids de macro es troben "
+"llistats en ISO C 99, secció 7.8.1."
+
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "A la directiva número %u, el component que segueix «<» no està seguit de «>»."
+msgstr ""
+"A la directiva número %u, el component que segueix «<» no està seguit de «>»."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "La cadena es refereix a l’argument número %u però passa per alt l’argument número %u."
+msgstr ""
+"La cadena es refereix a l’argument número %u però passa per alt l’argument "
+"número %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el nombre d’especificacions de format en «%s» i «%s» no coincideix"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "A la directiva número %u, «{» no està seguit d’un número d’argument."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "A la directiva número %u, «,» no està seguit d’un número."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "La cadena acaba emmig d’una directiva: s’ha trobat una «{» sense la «}» corresponent."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"La cadena acaba emmig d’una directiva: s’ha trobat una «{» sense la «}» "
+"corresponent."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "La directiva número %u acaba en el caràcter no vàlid «%c», en lloc de «}»."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"La directiva número %u acaba en el caràcter no vàlid «%c», en lloc de «}»."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "La directiva número %u acaba en un caràcter no vàlid, en lloc de «}»."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "La cadena comença emmig d’una directiva: s’ha trobat una «}» sense la «{» corresponent."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"La cadena comença emmig d’una directiva: s’ha trobat una «}» sense la «{» "
+"corresponent."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La cadena conté un «}» solt després de la directiva número %u."
@@ -485,17 +655,25 @@ msgstr "A la directiva número %u, la combinació d’indicadors no és vàlida.
 #: 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»."
+msgstr ""
+"A la directiva número %u, no es pot especificar la precisió abans de «%c»."
 
 #: 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 "A la directiva número %u, el número d’argument per a la precisió ha de ser igual a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+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:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "A la directiva número %u, no es pot especificar la precisió abans de «%c»."
+msgid ""
+"In the directive number %u, a precision specification 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:406
 #, c-format
@@ -532,96 +710,146 @@ msgid "The string ends in the middle of a directive."
 msgstr "La cadena acaba emmig d’una directiva."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "La cadena es refereix als arguments tant per números absoluts d’argument com per especificacions no numerades d’argument."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"La cadena es refereix als arguments tant per números absoluts d’argument com "
+"per especificacions no numerades d’argument."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "A la directiva número %u, el número «0» d’argument no és un enter positiu."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"A la directiva número %u, el número «0» d’argument no és un enter positiu."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "A la directiva número %u, el número «0» d’argument de l’amplada no és un enter positiu."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"A la directiva número %u, el número «0» d’argument de l’amplada no és un "
+"enter positiu."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "A la directiva número %u, el número «0» d’argument de la precisió no és un enter positiu."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"A la directiva número %u, el número «0» d’argument de la precisió no és un "
+"enter positiu."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "A la directiva número %u, el caràcter «%c» no és una especificació de conversió vàlida."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"A la directiva número %u, el caràcter «%c» no és una especificació de "
+"conversió vàlida."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "El caràcter que termina la directiva número %u no és una especificació de conversió vàlida."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"El caràcter que termina la directiva número %u no és una especificació de "
+"conversió vàlida."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "La cadena es refereix a l’argument número %u de formes incompatibles."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-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."
+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."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "A la directiva número %u, «%s» no està seguit d’una coma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "A la directiva número %u, la subcadena «%s» no és un estil numèric vàlid."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"A la directiva número %u, la subcadena «%s» no és un estil numèric vàlid."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "A la directiva número %u, el número d’argument no està seguit per una coma i una de «%s», «%s», «%s» o «%s»."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"A la directiva número %u, el número d’argument no està seguit per una coma i "
+"una de «%s», «%s», «%s» o «%s»."
 
 # «choice» és el que apareix literalment en la directiva.  ivb
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "A la directiva número %u, una selecció («choice») no conté cap número."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-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»."
+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»."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-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 «%3$s»"
+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 «%3$s»"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "les especificacions de format de l’argument {%3$u} en «%1$s» i «%2$s» no són les mateixes"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"les especificacions de format de l’argument {%3$u} en «%1$s» i «%2$s» no són "
+"les mateixes"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "La cadena es refereix a l’argument número %u però passa per alt els arguments número %u i %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"La cadena es refereix a l’argument número %u però passa per alt els "
+"arguments número %u i %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "no existeix una especificació de format per als arguments %u i %u en «%s», només es pot descartar un argument"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"no existeix una especificació de format per als arguments %u i %u en «%s», "
+"només es pot descartar un argument"
 
-#: src/format-kde-kuit.c:251 src/format-kde-kuit.c:261
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
 msgid "error while parsing: %s"
 msgstr "error en analitzar: %s"
@@ -629,15 +857,27 @@ msgstr "error en analitzar: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "A la directiva número %u, el paràmetre %u és de tipus «%s», però se n’esperava un de tipus «%s»."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"A la directiva número %u, el paràmetre %u és de tipus «%s», però se "
+"n’esperava un de tipus «%s»."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "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."
+msgid ""
+"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."
+msgstr[0] ""
+"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."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -664,12 +904,18 @@ msgstr "S’ha trobat «~%c» sense el «~%c» corresponent."
 #: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, 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 «:»."
+msgstr ""
+"A la directiva número %u, s’han especificat tant el modificador «@» com el "
+"«:»."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-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 «~;»."
+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 «~;»."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -688,253 +934,298 @@ msgstr "les especificacions de format en «%s» i «%s» no són equivalents"
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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 «%s»"
-
-#: src/format-perl.c:434
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "A la directiva número %u, l’especificació de mida no és compatible amb l’especificació de conversió «%c»."
+msgstr ""
+"les especificacions de format de «%s» no són un subconjunt de les de «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python.c:472
-#: src/format-python-brace.c:435 src/format-python-brace.c:448
-#: src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "La subcadena es refereix a arguments tant pel seu nom com per especificacions d’argument sense nom."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"A la directiva número %u, l’especificació de mida no és compatible amb "
+"l’especificació de conversió «%c»."
 
-#: src/format-python.c:355
+#: src/format-python-brace.c:138
 #, 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."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "A la directiva número %u, «%c» no pot començar un nom de camp."
 
-#: src/format-python.c:431
+#: src/format-python-brace.c:157
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "les especificacions de format de «%s» necessiten un mapa, les de «%s» una tupla"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"A la directiva número %u, «%c» no pot començar un argument per a «getattr()»."
 
-#: src/format-python.c:438
+#: src/format-python-brace.c:171
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "les especificacions de format de «%s» necessiten una tupla, les de «%s» un mapa"
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+"A la directiva número %u, «%c» no pot començar un argument per a «getitem()»."
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python-brace.c:193
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» en «%3$s»"
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"A la directiva número %u, no s’admet més niament en l’especificació de "
+"format."
 
-#: src/format-python.c:495
+#: src/format-python-brace.c:278
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "les especificacions de format de l’argument «%3$s» en «%1$s» i «%2$s» no són les mateixes"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+"A la directiva número %u, hi ha una directiva de format sense terminar."
 
-#: src/format-python-brace.c:138
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"La subcadena es refereix a arguments tant pel seu nom com per "
+"especificacions d’argument sense nom."
+
+#: src/format-python.c:354
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "A la directiva número %u, «%c» no pot començar un nom de camp."
+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-brace.c:151
+#: src/format-python.c:430
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "A la directiva número %u, «%c» no pot començar un argument per a «getattr()»."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"les especificacions de format de «%s» necessiten un mapa, les de «%s» una "
+"tupla"
 
-#: src/format-python-brace.c:166
+#: src/format-python.c:437
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "A la directiva número %u, «%c» no pot començar un argument per a «getitem()»."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"les especificacions de format de «%s» necessiten una tupla, les de «%s» un "
+"mapa"
 
-#: src/format-python-brace.c:186
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "A la directiva número %u, no s’admet més niament en l’especificació de format."
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» "
+"en «%3$s»"
 
-#: src/format-python-brace.c:271
+#: src/format-python.c:494
 #, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "A la directiva número %u, hi ha una directiva de format sense terminar."
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"les especificacions de format de l’argument «%3$s» en «%1$s» i «%2$s» no són "
+"les mateixes"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "«%s» é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' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"«%s» é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:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "La cadena es refereix a una variable d’intèrpret amb un nom no‐ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "La cadena es refereix a una variable d’intèrpret amb una sintaxi de claus complexa.  No es permet l’ús d’aquesta sintaxi per motius de seguretat."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"La cadena es refereix a una variable d’intèrpret amb una sintaxi de claus "
+"complexa.  No es permet l’ús d’aquesta sintaxi per motius de seguretat."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "La cadena es refereix a una variable d’intèrpret el valor de la qual pot ser diferent dins de les funcions d’intèrpret."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"La cadena es refereix a una variable d’intèrpret el valor de la qual pot ser "
+"diferent dins de les funcions d’intèrpret."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "La cadena es refereix a una variable d’intèrpret amb un nom buit."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "A la directiva número %u, el caràcter «%c» no és un dígit entre 1 i 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
-
-#: src/hostname.c:181 src/msgattrib.c:356 src/msgcat.c:295 src/msgcmp.c:173
-#: src/msgcomm.c:286 src/msgconv.c:245 src/msgen.c:242 src/msgexec.c:187
-#: src/msgfilter.c:289 src/msgfmt.c:417 src/msggrep.c:420 src/msginit.c:269
-#: src/msgmerge.c:357 src/msgunfmt.c:263 src/msguniq.c:265
-#: src/recode-sr-latin.c:111 src/urlget.c:144 src/xgettext.c:646
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"GPLv3+: llicència GNU GPL ver. 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
-"Aquest és programari lliure: podeu modificar‐lo i redistribuir‐lo si voleu.\n"
-"No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
-
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgcmp.c:179
-#: src/msgcomm.c:292 src/msgconv.c:251 src/msgen.c:248 src/msgexec.c:193
-#: src/msgfilter.c:295 src/msgfmt.c:423 src/msggrep.c:426 src/msginit.c:275
-#: src/msgmerge.c:363 src/msgunfmt.c:269 src/msguniq.c:271 src/urlget.c:150
-#: src/xgettext.c:652
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Escrit per %s.\n"
+"El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/hostname.c:210 src/msgattrib.c:418 src/msgcat.c:364 src/msgcmp.c:210
-#: src/msgcomm.c:356 src/msgconv.c:304 src/msgen.c:301 src/msgexec.c:260
-#: src/msgfilter.c:410 src/msgfmt.c:771 src/msggrep.c:513 src/msginit.c:359
-#: src/msgmerge.c:495 src/msgunfmt.c:424 src/msguniq.c:323
-#: src/recode-sr-latin.c:144 src/urlget.c:173 src/xgettext.c:900
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Proveu «%s --help» per a obtenir més informació.\n"
-
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Mostra el nom d’estació de la màquina.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de l’eixida:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short          Nom curt de l’estació.\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long    Nom llarg de l’estació, inclou el nom de domini\n"
 "                       completament qualificat i els àlies.\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address     Adreces corresponents al nom d’estació.\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:917 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1080
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
 
-#: src/hostname.c:233 src/msgattrib.c:537 src/msgcat.c:472 src/msgcmp.c:261
-#: src/msgcomm.c:458 src/msgconv.c:388 src/msgen.c:384 src/msgexec.c:309
-#: src/msgfilter.c:510 src/msgfmt.c:919 src/msggrep.c:631 src/msginit.c:423
-#: src/msgmerge.c:622 src/msgunfmt.c:530 src/msguniq.c:420
-#: src/recode-sr-latin.c:165 src/urlget.c:189 src/xgettext.c:1082
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "no s’ha pogut obtenir el nom d’estació"
 
-#: src/hostname.c:235 src/msgattrib.c:539 src/msgcat.c:474 src/msgcmp.c:263
-#: src/msgcomm.c:460 src/msgconv.c:390 src/msgen.c:386 src/msgexec.c:311
-#: src/msgfilter.c:512 src/msgfmt.c:921 src/msggrep.c:633 src/msginit.c:425
-#: src/msgmerge.c:624 src/msgunfmt.c:532 src/msguniq.c:422
-#: src/recode-sr-latin.c:168 src/urlget.c:191 src/xgettext.c:1084
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
+msgstr "no s’ha especificat el selector"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:242 src/msgattrib.c:546 src/msgcat.c:481 src/msgcmp.c:270
-#: src/msgcomm.c:467 src/msgconv.c:397 src/msgen.c:393 src/msgexec.c:318
-#: src/msgfilter.c:519 src/msgfmt.c:932 src/msggrep.c:640 src/msginit.c:432
-#: src/msgmerge.c:635 src/msgunfmt.c:541 src/msguniq.c:429
-#: src/recode-sr-latin.c:175 src/urlget.c:200 src/xgettext.c:1091
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
+# Condició d’error.  ivb
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr "no s’ha pogut crear el context d’XPath"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+# Condició d’error.  ivb
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "no s’ha pogut obtenir el nom d’estació"
+msgid "cannot evaluate XPath expression: %s"
+msgstr "no s’ha pogut avaluar l’expressió d’XPath: %s"
+
+# No empren quote().  El segon és un atribut.  ivb
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr "el node «%s» no conté l’atribut «%s»"
+
+# No empren quote().  ivb
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "el valor «%s» de l’atribut no és vàlid per a «%s»"
+
+# No empra quote(), és una URL.  ivb
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr "l’element arrel no és «rules» sota l’espai de noms «%s»"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+# No empra quote().  ivb
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "no s’ha pogut llegir «%s»: %s"
+
+# Condició d’error.  ivb
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr "no s’ha pogut avaluar el camí d’ubicació d’XPath: %s"
+
+# No empren quote().  El segon és un atribut.  ivb
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr "el node «%s» no conté l’atribut «%s»"
+
+# No empra quote().  ivb
+#: src/locating-rule.c:307
+#, c-format
+msgid "cannot read XML file %s"
+msgstr "no s’ha pogut llegir el fitxer XML «%s»"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr "l’element arrel no és «locatingRules»"
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "es permet com a molt un fitxer d’entrada"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:471 src/msgfmt.c:479
-#: src/msgfmt.c:494 src/msgfmt.c:516 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:662 src/xgettext.c:669 src/xgettext.c:672
-#: src/xgettext.c:675
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "«%s» i «%s» són mútuament excloents"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -943,137 +1234,148 @@ msgstr ""
 "Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
 "manipula aquests atributs.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:789 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:918
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ubicació del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:793 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:924
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORI\n"
 "                       Afegeix el DIRECTORI a la llista de cerca de fitxers\n"
 "                       d’entrada.\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:815 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:929
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ubicació del fitxer d’eixida:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:817 src/msgfmt.c:866
-#: src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492 src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Els resultats s’escriuran a l’eixida estàndard si no s’especifica cap fitxer\n"
+"Els resultats s’escriuran a l’eixida estàndard si no s’especifica cap "
+"fitxer\n"
 "d’eixida, o si aquest és «-».\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecció dels missatges:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated     Manté els missatges traduïts, elimina els no traduïts.\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated     Manté els missatges traduïts, elimina els no "
+"traduïts.\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated    Manté els missatges no traduïts, elimina els traduïts.\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated    Manté els missatges no traduïts, elimina els "
+"traduïts.\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy       Elimina els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy     Manté els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete    Elimina els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete    Manté els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulació dels atributs:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy      Marca tots els missatges com a «fuzzy».\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, 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:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete    Marca tots els missatges com a obsolets.\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete    Marca tots els missatges com a no obsolets.\n"
+msgstr ""
+"      --clear-obsolete    Marca tots els missatges com a no obsolets.\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1082,183 +1384,204 @@ msgstr ""
 "      --previous       En marcar els missatges com a «fuzzy», manté els\n"
 "                       «msgid» anteriors dels missatges traduïts.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr ""
 "      --clear-previous    Elimina de tots els missatges el comentari amb el\n"
 "                       «msgid» anterior.\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
 "      --empty          En eliminar la marca «fuzzy» també deixa buit el\n"
 "                       «msgstr» corresponent.\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FITXER.po\n"
 "                       Només manipula les entrades llistades al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po\n"
-"                       Només manipula les entrades no llistades al FITXER.po\n"
+"                       Només manipula les entrades no llistades al FITXER."
+"po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy          Equival a «--only-fuzzy --clear-fuzzy».\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:879 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxi del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input\n"
-"                       El fitxer d’entrada segueix la sintaxi «.properties» de\n"
+"                       El fitxer d’entrada segueix la sintaxi «.properties» "
+"de\n"
 "                       Java.\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input\n"
 "                       El fitxer d’entrada segueix la sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:907 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1026
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalls de l’eixida:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1028
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"      --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:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1032
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1034
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1036
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape         Empra seqüències d’escapada de C a l’eixida, en lloc\n"
 "                       de caràcters estesos.\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1038
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1040
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1042
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1044
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1046
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict         Genera un fitxer PO estrictament conforme amb Uniforum.\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict         Genera un fitxer PO estrictament conforme amb "
+"Uniforum.\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1050
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output\n"
 "                       Genera un fitxer amb sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1052
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1054
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1267,26 +1590,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:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1057
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1059
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:904
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1294,7 +1618,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:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1316,25 +1640,25 @@ msgstr ""
 "extrets i posicions de fitxer s’acumularan, a no ser que especifiqueu\n"
 "«--use-first», al qual cas es treuran del primer fitxer PO que els definesca.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:920
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FITXER_ENTRADA…      Fitxers d’entrada.\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:922
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:795
-#: src/xgettext.c:926
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:409 src/msgcomm.c:400
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1344,87 +1668,95 @@ msgstr ""
 "                       Escriu els missatges amb menys de NÚMERO definicions\n"
 "                       (per defecte infinites).\n"
 
-#: src/msgcat.c:412
+#: 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 ""
 "  ->, --more-than=NÚMERO\n"
-"                       Escriu els missatges amb més de NÚMERO definicions (per\n"
+"                       Escriu els missatges amb més de NÚMERO definicions "
+"(per\n"
 "                       defecte 0).\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: 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 ""
-"  -u, --unique         Equival a «--less-than=2», indica que només s’escriguen\n"
+"  -u, --unique         Equival a «--less-than=2», indica que només "
+"s’escriguen\n"
 "                       els missatges únics.\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:881
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input\n"
-"                       Els fitxers d’entrada segueixen la sintaxi «.properties»\n"
+"                       Els fitxers d’entrada segueixen la sintaxi «."
+"properties»\n"
 "                       de Java.\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:883
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 "      --stringtable-input\n"
-"                       Els fitxers d’entrada segueixen la sintaxi «.strings» de\n"
+"                       Els fitxers d’entrada segueixen la sintaxi «.strings» "
+"de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOM    Codificació de l’eixida.\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first      Empra la primera traducció de cada missatge, no mescla\n"
+"      --use-first      Empra la primera traducció de cada missatge, no "
+"mescla\n"
 "                       diverses traduccions.\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 "     --lang=NOM_DE_CATÀLEG\n"
-"                       Estableix el camp «Language» en l’entrada de capçalera.\n"
+"                       Estableix el camp «Language» en l’entrada de "
+"capçalera.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cal que especifiqueu exactament dos fitxers d’entrada"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, 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:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1442,83 +1774,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:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po               Traduccions.\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot              Referències al codi font.\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadors del funcionament:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy      Té en compte les entrades difuses.\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, 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:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "aquest missatge no està traduït"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "aquest missatge s’empra però no s’ha definit…"
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "…però aquesta definició és similar"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s’empra"
 
-#: src/msgcmp.c:554 src/msgfmt.c:653 src/msgfmt.c:1444 src/xgettext.c:883
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:317
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cal que especifiqueu almenys dos fitxers"
@@ -1526,7 +1862,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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1547,77 +1883,85 @@ msgstr ""
 "que els definesca.  Les posicions de fitxer de tots els fitxers PO\n"
 "s’acumularan.\n"
 
-#: src/msgcomm.c:403
+#: 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 ""
 "  ->, --more-than=NÚMERO\n"
-"                       Escriu els missatges amb més de NÚMERO definicions (per\n"
+"                       Escriu els missatges amb més de NÚMERO definicions "
+"(per\n"
 "                       defecte 1).\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1061
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, 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"
+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:312
+#: src/msgconv.c:311
 #, 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"
+msgstr ""
+"Converteix un catàleg de traduccions a una codificació de caràcters "
+"diferent.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Objectiu de la conversió:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, 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:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict         Genera un fitxer PO estrictament conforme amb Uniforum.\n"
+msgstr ""
+"      --strict         Genera un fitxer PO estrictament conforme amb "
+"Uniforum.\n"
 
-#: src/msgen.c:259 src/msgfmt.c:434 src/xgettext.c:692
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "cal que especifiqueu exactament un fitxer d’entrada"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FITXER_ENTRADA\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1630,22 +1974,22 @@ msgstr ""
 "amb «xgettext»).  S’assignarà a les entrades no traduïdes una traducció igual\n"
 "al «msgid» corresponent.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FITXER_ENTRADA       Fitxer d’entrada PO o POT.\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "manca el nom d’una ordre"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] ORDRE [OPCIÓ_D’ORDRE]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1660,7 +2004,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1669,51 +2013,51 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Entrada de l’ordre:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 "      --newline        Afegeix un caràcter de nova línia al final de\n"
 "                       l’entrada.\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=FITXER_ENTRADA\n"
 "                       Fitxer PO d’entrada.\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "no s’ha pogut escriure a l’eixida estàndard"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "manca el nom d’un filtre"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cal que especifiqueu almenys un guió de «sed»"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FILTRE [OPCIÓ_DE_FILTRE]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1722,338 +2066,380 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Entrada i eixida del filtre:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
 msgstr ""
 "      --newline        Afegeix un caràcter de nova línia al final de\n"
-"                       l’entrada i elimina un caràcter de nova línia del final\n"
+"                       l’entrada i elimina un caràcter de nova línia del "
+"final\n"
 "                       de l’eixida."
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=FITXER_GUIÓ\n"
-"                       Afegeix els continguts del FITXER_GUIÓ a les ordres a\n"
+"                       Afegeix els continguts del FITXER_GUIÓ a les ordres "
+"a\n"
 "                       executar.\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent    Evita la impressió automàtica de l’espai de patró.\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent    Evita la impressió automàtica de l’espai de "
+"patró.\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header    Manté intacta l’entrada de capçalera, sense filtrar‐la.\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header    Manté intacta l’entrada de capçalera, sense filtrar‐"
+"la.\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "l’eixida del filtre no acaba en un caràcter de nova línia"
 
-#: src/msgfmt.c:346
+#: src/msgfmt.c:372
 #, 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:393
+#: src/msgfmt.c:419
 #, 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:423 src/msgunfmt.c:269 src/xgettext.c:652
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:440
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no s’ha d’indicar cap fitxer d’entrada si s’especifiquen «%s» i «%s»"
 
-#: src/msgfmt.c:485 src/msgfmt.c:507 src/msgfmt.c:529 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:500 src/msgfmt.c:522 src/msgfmt.c:557 src/msgunfmt.c:324
-#: src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "«%s» necessita una especificació «-l LOCALE»"
 
-#: src/msgfmt.c:539
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "«%s» necessita una especificació «--template PLANTILLA»"
 
-#: src/msgfmt.c:546
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "«%s» necessita una especificació «-o FITXER»"
 
-#: src/msgfmt.c:552
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "«%s» i «%s» són mútuament excloents en emprar «%s»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:566 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:572 src/msgfmt.c:578
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "«%s» només és vàlida amb «%s», «%s» o «%s»"
 
+# No empra quote().  És una plantilla.  ivb
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "no s’han pogut trobar les regles  ITS per a la plantilla «%s»"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:741
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:745
+#: src/msgfmt.c:876
 #, 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:750
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducció difusa"
 msgstr[1] ", %d traduccions difuses"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:886
 #, 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:775
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] nom_fitxer.po…\n"
 
-#: src/msgfmt.c:779
+#: src/msgfmt.c:910
 #, 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:784 src/xgettext.c:913
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-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:791
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nom_fitxer.po…       Fitxers d’entrada.\n"
 
-#: src/msgfmt.c:798 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:962
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
 
-#: src/msgfmt.c:800
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java           Mode Java: genera una classe «ResourceBundle» de Java.\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java           Mode Java: genera una classe «ResourceBundle» de "
+"Java.\n"
 
-#: src/msgfmt.c:802
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2          Com «--java», però assumeix Java2 (JDK 1.2 o superior).\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2          Com «--java», però assumeix Java2 (JDK 1.2 o "
+"superior).\n"
 
-#: src/msgfmt.c:804
+#: src/msgfmt.c:935
 #, 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:806
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources\n"
-"                       Mode C# amb recursos: genera un fitxer «.resources» de\n"
+"                       Mode C# amb recursos: genera un fitxer «.resources» "
+"de\n"
 "                       .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgfmt.c:808
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl            Mode Tcl: genera un fitxer «.msg» per a «msgcat» de\n"
 "                       Tcl.\n"
 
-#: src/msgfmt.c:810
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt             Mode Qt: genera un fitxer «.qm» de Qt.\n"
 
-#: src/msgfmt.c:812
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --desktop        Mode Desktop: genera un fitxer «.desktop».\n"
 
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --xml            Mode XML: genera un fitxer XML.\n"
+
 # Ull!  En aquest cas no és un fitxer PO!  ivb
-#: src/msgfmt.c:819
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
+msgstr ""
+"      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
 
-#: src/msgfmt.c:821 src/xgettext.c:937
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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:824
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Java:\n"
 
-#: src/msgfmt.c:826 src/msgfmt.c:842 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:828 src/msgfmt.c:844 src/msgfmt.c:854 src/msgfmt.c:864
-#: src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALE    Nom del locale, bé «idioma» o bé «idioma_PAÍS».\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE    Nom del locale, bé «idioma» o bé «idioma_PAÍS».\n"
 
-#: src/msgfmt.c:830
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source         Produeix un fitxer «.java» en lloc d’un «.class».\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source         Produeix un fitxer «.java» en lloc d’un «.class».\n"
 
-#: src/msgfmt.c:832
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORI         Directori base de la jerarquia de directoris de les\n"
 "                       classes.\n"
 
-#: src/msgfmt.c:834
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"El nom de la classe es construeix afegint el nom del locale al nom del recurs,\n"
+"El nom de la classe es construeix afegint el nom del locale al nom del "
+"recurs,\n"
 "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:840
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
 
-#: src/msgfmt.c:846 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 "  -d DIRECTORI         Directori base dels fitxers «.dll» dependents del\n"
 "                       locale.\n"
 
-#: src/msgfmt.c:848
+#: src/msgfmt.c:981
 #, 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:852
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
 
-#: src/msgfmt.c:856 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d DIRECTORI         Directori base dels catàlegs «.msg» de missatges.\n"
 
-#: src/msgfmt.c:858
+#: src/msgfmt.c:991
 #, 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:862
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opcions del mode Desktop:\n"
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "      --template=FITXER    Empra un FITXER «.desktop» com a plantilla.\n"
+msgstr ""
+"      --template=FITXER    Empra un FITXER «.desktop» com a plantilla.\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORI         Directori base dels fitxers PO.\n"
 
-#: src/msgfmt.c:872 src/xgettext.c:991
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2063,47 +2449,70 @@ msgstr ""
 "                       Cerca també la PARAULA clau indicada.\n"
 "  -k, --keyword        No cerca les paraules clau per defecte.\n"
 
-#: src/msgfmt.c:875
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Les opcions «-l», «-o» i «--template» són obligatòries.  Si s’especifica «-D»\n"
+"Les opcions «-l», «-o» i «--template» són obligatòries.  Si s’especifica «-"
+"D»\n"
 "es llegiran els fitxers d’entrada del directori indicat en lloc dels donats\n"
 "com a arguments de la línia d’ordres.\n"
 
-#: src/msgfmt.c:887 src/xgettext.c:954
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr "Opcions del mode XML:\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+"  -L, --language=NOM\n"
+"                       Reconeix el llenguatge XML amb el NOM especificat.\n"
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr "      --template=FITXER    Empra un FITXER XML com a plantilla.\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretació del fitxer d’entrada:\n"
 
-#: src/msgfmt.c:889
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"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:892
+#: src/msgfmt.c:1041
 #, 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:894
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 "      --check-header    Verifica la presència i contingut de l’entrada de\n"
 "                       capçalera.\n"
 
 # La directiva s’anomena «domain».  ivb
-#: src/msgfmt.c:896
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2112,144 +2521,147 @@ msgstr ""
 "      --check-domain    Comprova si hi ha conflictes entre les directives\n"
 "                       «domain» i l’opció «--output-file».\n"
 
-#: src/msgfmt.c:899
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility\n"
 "                       Comprova si el «msgfmt» de GNU es comporta com el\n"
 "                       «msgfmt» d’X/Open.\n"
 
-#: src/msgfmt.c:901
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CARÀCTER]\n"
 "                       Comprova la presència d’acceleradors de teclat per a\n"
 "                       ítems de menú.\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:1053
 #, 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:909
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NÚMERO\n"
 "                       Alinea les cadenes a NÚMERO octets (%d per defecte).\n"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "     --endianness=ORDENACIÓ\n"
-"                       Escriu els números de 32 bits amb l’ordenació d’octets\n"
+"                       Escriu els números de 32 bits amb l’ordenació "
+"d’octets\n"
 "                       indicada (big-endian o little-endian, el valor per\n"
 "                       defecte depèn de la plataforma).\n"
 
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash        Fa que el fitxer binari no incloga la taula de\n"
 "                       dispersió.\n"
 
-#: src/msgfmt.c:923
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics     Mostra estadístiques sobre les traduccions.\n"
 
-#: src/msgfmt.c:925 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 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:1038
+#: src/msgfmt.c:1185
 #, 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:1041
+#: src/msgfmt.c:1187
 #, 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:1051
-#, 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:1053
-#, 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:1077
+#: src/msgfmt.c:1211
 #, 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:1082
+#: src/msgfmt.c:1216
 #, 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"
+msgstr ""
+"el nom de domini «%s» no és adequat com a nom de fitxer: se n’emprarà un "
+"prefix"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "es descarta la directiva «domain %s»"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» buida"
 
-#: src/msgfmt.c:1157
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» difusa"
 
-#: src/msgfmt.c:1206
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avís: el fitxer font conté una traducció difusa"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:1324
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "«%s» no existeix"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:1335
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "«%s» existeix però no s’ha pogut llegir"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:566
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:164 src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176
-#: src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, 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»"
+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»"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2258,7 +2670,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2339,29 +2751,38 @@ msgstr ""
 "  -v, --invert-match    Només tria els missatges que no concorden amb cap\n"
 "                       criteri de selecció.\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape         Empra seqüències d’escapada de C a l’eixida, en lloc de\n"
+"      --escape         Empra seqüències d’escapada de C a l’eixida, en lloc "
+"de\n"
 "                       caràcters estesos.\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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"
+msgstr ""
+"      --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "El vostre entorn és indiferent a l’idioma.  Per favor, establiu el\n"
 "valor de la vostra variable d’entorn LANG, tal i com es descriu al\n"
@@ -2369,7 +2790,7 @@ msgstr ""
 "vostres traduccions.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2380,12 +2801,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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "S’ha creat «%s».\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2394,51 +2815,59 @@ msgstr ""
 "Crea un fitxer PO nou, inicialitzant‐ne la metainformació amb valors obtesos\n"
 "de l’entorn de l’usuari.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 "  -i, --input=FITXER_ENTRADA\n"
 "                       Fitxer POT d’entrada.\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Si no s’especifica el fitxer d’entrada, es cercarà el fitxer POT al directori\n"
+"Si no s’especifica el fitxer d’entrada, es cercarà el fitxer POT al "
+"directori\n"
 "actual.  Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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:388
+#: src/msginit.c:391
 #, 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 ""
-"Si no s’especifica el fitxer d’eixida, aquest dependrà de l’opció «--locale» o\n"
+"Si no s’especifica el fitxer d’eixida, aquest dependrà de l’opció «--locale» "
+"o\n"
 "de la configuració de locale de l’usuari.  Si és «-», els resultats\n"
 "s’escriuran a l’eixida estàndard.\n"
 
 # Espere que s’entenga…  ivb
-#: src/msginit.c:401
-#, 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:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
+msgstr ""
+"  -l, --locale=ii_PP    Estableix el locale objectiu (idioma i país).\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator    Assumeix que el fitxer PO és generat automàticament.\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator    Assumeix que el fitxer PO és generat "
+"automàticament.\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2446,13 +2875,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:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "error en llegir el directori actual"
 
 # Multilínia.  ivb
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2460,67 +2889,79 @@ 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:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/msginit.c:1419 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, 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:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Cal que el nou catàleg de missatges continga la vostra adreça electrònica, de\n"
-"forma que els usuaris puguen aportar‐vos realimentació sobre les traduccions,\n"
+"Cal que el nou catàleg de missatges continga la vostra adreça electrònica, "
+"de\n"
+"forma que els usuaris puguen aportar‐vos realimentació sobre les "
+"traduccions,\n"
 "i de forma que els mantenidors puguen contactar amb vosaltres en cas que es\n"
 "produesquen problemes tècnics inesperats.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1616
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduccions al català del paquet «%s»"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "el fitxer d’entrada «%s» no conté una entrada de capçalera amb una especificació de joc de caràcters"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+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:208
+#: 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"
+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"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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ó"
+msgstr ""
+"el joc de caràcters destinació, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:554 src/xgettext.c:3532
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "avís: "
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2530,10 +2971,11 @@ msgstr ""
 "«UTF-8» entre altres.  Es convertirà l’eixida a «UTF-8».\n"
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2543,7 +2985,7 @@ msgstr ""
 "codificació, useu l’opció «--to-code».\n"
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2558,7 +3000,7 @@ msgstr ""
 "codi font.\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2572,13 +3014,13 @@ msgstr ""
 "Aquestes són unes solucions possibles:\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2590,7 +3032,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:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2604,7 +3046,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:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2618,84 +3060,94 @@ 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:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "l’expressió de «plural» pot produir valors negatius"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a "
+"%lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "l’expressió de «plural» pot produir una divisió entre zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "l’expressió de «plural» pot produir un desbordament enter"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "l’expressió de «plural» pot produir excepcions aritmètiques, possiblement divisions entre zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"l’expressió de «plural» pot produir excepcions aritmètiques, possiblement "
+"divisions entre zero"
 
 # ivb (2002/03/14)
 # 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:271
+#: src/msgl-check.c:270
 #, 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:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "el catàleg de missatges té traduccions amb forma plural"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 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:389
+#: src/msgl-check.c:388
 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:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "el valor d’«nplurals» no és vàlid"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "l’expressió de «plural» no és vàlida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "«nplurals» és %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, 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:495
+#: src/msgl-check.c:494
 #, 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:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-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:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+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:616
 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:624
+#: src/msgl-check.c:623
 #, 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»"
@@ -2708,7 +3160,7 @@ msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»"
 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:665
+#: src/msgl-check.c:664
 #, 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»"
@@ -2721,92 +3173,120 @@ msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»"
 msgid "plural handling is a GNU gettext extension"
 msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, 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:745
+#: src/msgl-check.c:744
 #, 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:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "el camp de capçalera «%s» encara té el valor inicial per defecte\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "manca el camp de capçalera «%s» a la capçalera\n"
 
 # Missatge d’error.  ivb
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
-msgstr "s’han trobat els punts suspensius ASCII «...» en lloc del caràcter Unicode «…»"
+msgstr ""
+"s’han trobat els punts suspensius ASCII «...» en lloc del caràcter Unicode "
+"«…»"
 
 # Missatge d’error.  ivb
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr "s’ha trobat espai abans dels punts suspensius en una cadena visible per l’usuari"
+msgstr ""
+"s’ha trobat espai abans dels punts suspensius en una cadena visible per "
+"l’usuari"
 
 # Missatge d’error.  ivb
 # El caràcter adequat depèn del context.  ivb
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
-msgstr "s’han trobat les cometes dobles ASCII «\"» en lloc del caràcter Unicode adequat"
+msgstr ""
+"s’han trobat les cometes dobles ASCII «\"» en lloc del caràcter Unicode "
+"adequat"
 
 # Missatge d’error.  ivb
 # El caràcter adequat depèn del context.  ivb
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
-msgstr "s’han trobat les cometes simples ASCII «'» en lloc del caràcter Unicode adequat"
+msgstr ""
+"s’han trobat les cometes simples ASCII «'» en lloc del caràcter Unicode "
+"adequat"
 
-#: src/msgl-iconv.c:66
+# Missatge d’error.  ivb
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "s’ha trobat el pic ASCII «%c» en lloc del caràcter Unicode"
+
+#: 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:70
+#: 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:291
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"el fitxer d’entrada no conté una entrada de capçalera amb una especificació "
+"de joc de caràcters"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/x-python.c:666 src/xgettext.c:751
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "No es pot convertir de «%s» a «%s».  «%s» es basa en iconv(), i iconv() no permet l’ús d’aquesta conversió."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"No es pot convertir de «%s» a «%s».  «%s» es basa en iconv(), i iconv() no "
+"permet l’ús d’aquesta conversió."
 
 # Es refereix a quelcom que _ha_ocorregut_.  ivb
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "La conversió de «%s» a «%s» crea duplicats: alguns msgid diferents esdevenen iguals."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"La conversió de «%s» a «%s» crea duplicats: alguns msgid diferents esdevenen "
+"iguals."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/x-python.c:673
-#: src/xgettext.c:758
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()."
+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()."
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "«%s» només és vàlida amb «%s»"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tipus de còpia de seguretat"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2830,59 +3310,64 @@ 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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po               Traduccions referents al codi font antic.\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot              Referències al nou codi font.\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 "  -C, --compendium=FITXER\n"
-"                       Biblioteca addicional de traduccions de missatges; es\n"
+"                       Biblioteca addicional de traduccions de missatges; "
+"es\n"
 "                       pot especificar diverses voltes.\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, 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:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode d’actualització:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=SUFIX    Substitueix el sufix habitual de còpia de seguretat.\n"
+msgstr ""
+"      --suffix=SUFIX    Substitueix el sufix habitual de còpia de "
+"seguretat.\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2894,35 +3379,47 @@ msgstr ""
 "possibles:\n"
 "  none, off        Mai fa còpies de seguretat (ni especificant «--backup»).\n"
 "  numbered, t      Fa còpies de seguretat numerades.\n"
-"  existing, nil    Fa còpies de seguretat numerades si ja n’existeixen, les fa\n"
+"  existing, nil    Fa còpies de seguretat numerades si ja n’existeixen, les "
+"fa\n"
 "                   simples en cas contrari.\n"
 "  simple, never    Fa còpies de seguretat simples sempre.\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous       Manté els «msgid» anteriors dels missatges traduïts.\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous       Manté els «msgid» anteriors dels missatges traduïts.\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, 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:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "cal definir formes plurals d’aquest missatge"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "no s’han de definir formes plurals d’aquest missatge"
@@ -2931,104 +3428,122 @@ 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:2053
+#: src/msgmerge.c:2110
 #, 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"
+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"
 
 # ivb (2002/01/08)
 # ivb  Indica el final del processament, el gènere i nombre no són importants.
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " fet.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER]…\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Converteix un catàleg binari de missatges en un fitxer PO d’estil Uniforum.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
-"  -j, --java           Mode Java: l’entrada és una classe «ResourceBundle» de\n"
+"  -j, --java           Mode Java: l’entrada és una classe «ResourceBundle» "
+"de\n"
 "                       Java.\n"
 
-#: src/msgunfmt.c:443
+#: 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"
+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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources\n"
 "                       Mode C# amb recursos: l’entrada és un fitxer\n"
 "                       «.resources» de .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+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:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FITXER…              Fitxers MO d’entrada.\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"El nom de la classe es construeix afegint el nom del locale al nom del recurs,\n"
-"separats per un caràcter de subratllat.  La classe es trobarà fent servir el\n"
+"El nom de la classe es construeix afegint el nom del locale al nom del "
+"recurs,\n"
+"separats per un caràcter de subratllat.  La classe es trobarà fent servir "
+"el\n"
 "camí a les classes, CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: 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"
-"subdirectori del directori especificat.  El nom del subdirectori dependrà del\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:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3037,17 +3552,19 @@ msgstr ""
 "Les opcions «-l» i «-d» són obligatòries.  El fitxer «.msg» es trobarà al\n"
 "directori especificat.\n"
 
-#: src/msgunfmt.c:512
+#: 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:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict         Genera un fitxer PO estrictament conforme amb Uniforum.\n"
+msgstr ""
+"      --strict         Genera un fitxer PO estrictament conforme amb "
+"Uniforum.\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3069,19 +3586,21 @@ 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:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated       Només mostra els missatges duplicats.\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "  -u, --unique         Només mostra els missatges únics, descartant els\n"
 "                       duplicats.\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3150,27 +3669,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "l’ús de «#~» no és consistent"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "manca la secció «msgstr[]»"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "manca la secció «msgid_plural»"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "manca la secció «msgstr»"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la primera forma plural no té índex zero"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la forma plural té un índex incorrecte"
@@ -3180,7 +3699,7 @@ msgstr "la forma plural té un índex incorrecte"
 msgid "too many errors, aborting"
 msgstr "hi ha massa errors, s’avorta"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "la seqüència multioctet no és vàlida"
@@ -3190,43 +3709,43 @@ msgstr "la seqüència multioctet no és vàlida"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "hi ha una seqüència multioctet incompleta al final del fitxer"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, 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:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "ha fallat iconv()"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la paraula clau «%s» no és coneguda"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, 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:981
+#: src/po-lex.c:979
 #, 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:987
+#: src/po-lex.c:985
 #, 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:1008
+#: src/po-lex.c:1006
 #, 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:325 src/xgettext.c:1103
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
@@ -3239,41 +3758,74 @@ msgstr "la definició del missatge és duplicada"
 msgid "this is the location of the first definition"
 msgstr "aquesta és la ubicació de la primera definició"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr "el nom de grup no està terminat"
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr "el caràcter no blanc no és vàlid"
+
+#: src/read-desktop.c:405
+#, c-format
+msgid "missing '=' after \"%s\""
+msgstr "manca «=» després de «%s»"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "la línia no blanca no és vàlida"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "el fitxer «%s» és truncat"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fitxer «%s» conté una cadena no acabada en nul"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "el fitxer «%s» conté una cadena no acabada en nul"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fitxer «%s» no és en el format MO de GNU"
 
 # ivb (2002/08/08)
 # ivb  «%s» és una cadena amb forma «sysdep_string[%u]»
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "el fitxer «%s» conté una cadena no acabada en nul, en «%s»"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "avís: la sintaxi «\\uxxxx» del caràcter Unicode no és vàlida"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "avís: el caràcter Unicode no és vàlid"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "avís: la cadena no està terminada"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "avís: error de sintaxi"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "avís: el parell clau/valor no està terminat"
 
@@ -3281,11 +3833,11 @@ msgstr "avís: el parell clau/valor no està terminat"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "avís: error de sintaxi, cal «;» després de la cadena"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "avís: error de sintaxi, cal «=» o «;» després de la cadena"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrit per %s i %s.\n"
@@ -3294,17 +3846,17 @@ msgstr "Escrit per %s i %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recodifica un text en serbi de l’alfabet ciríl·lic al llatí.\n"
 
 # Missatge d’ajuda.  ivb
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3313,27 +3865,27 @@ msgstr ""
 "El text d’entrada es llegeix de l’entrada estàndard.  El text convertit\n"
 "s’escriu a l’eixida estàndard.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l’entrada no és vàlida segons la codificació «%s»"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 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:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "calen dos arguments"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Forma d’ús: %s [OPCIÓ] URL FITXER\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3342,112 +3894,142 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "error en escriure a l’eixida estàndard"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error després d’haver llegit «%s»"
 
 # És un URL.
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "S’està obtenint %s…"
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " ha expirat.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " ha fallat.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "No es poden generar diversos dominis de traducció dins d’un sol fitxer amb el format d’eixida especificat.  Proveu d’emprar la sintaxi de fitxer PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"No es poden generar diversos dominis de traducció dins d’un sol fitxer amb "
+"el format d’eixida especificat.  Proveu d’emprar la sintaxi de fitxer PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "No es poden generar diversos dominis de traducció dins d’un sol fitxer amb el format d’eixida especificat."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"No es poden generar diversos dominis de traducció dins d’un sol fitxer amb "
+"el format d’eixida especificat."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "El catàleg de missatges té traduccions que depenen del context, però el format d’eixida no permet l’ús de contexts."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"El catàleg de missatges té traduccions que depenen del context, però el "
+"format d’eixida no permet l’ús de contexts."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "El catàleg de missatges conté traduccions de formes plurals, però el format d’eixida no en permet l’ús.  Proveu de generar una classe Java emprant «msgfmt --java», en lloc d’un fitxer «.properties»."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"El catàleg de missatges conté traduccions de formes plurals, però el format "
+"d’eixida no en permet l’ús.  Proveu de generar una classe Java emprant "
+"«msgfmt --java», en lloc d’un fitxer «.properties»."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-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:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+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:232 src/write-catalog.c:276
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "eixida estàndard"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "no s’ha pogut crear el directori «%s»"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "no s’ha pogut compil·lar la classe C#, per favor useu «--verbose»"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "no s’ha pogut compil·lar la classe C#"
 
-#: src/write-java.c:1092
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "error en obrir «%s» per a escriure"
+
+#: src/write-java.c:1096
 #, 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:1211
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "no s’ha pogut compil·lar la classe Java, per favor useu «--verbose» o establiu la variable d’entorn JAVAC"
+msgstr ""
+"no s’ha pogut compil·lar la classe Java, per favor useu «--verbose» o "
+"establiu la variable d’entorn JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "no s’ha pogut compil·lar la classe Java, per favor establiu la variable d’entorn JAVAC"
-
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "error en obrir «%s» per a escriure"
+msgstr ""
+"no s’ha pogut compil·lar la classe Java, per favor establiu la variable "
+"d’entorn JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "la seqüència multioctet no és completa"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "els missatges internacionalitzats no han de contenir la seqüència d’escapada «%c»"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"els missatges internacionalitzats no han de contenir la seqüència d’escapada "
+"«%c»"
 
 # Multilínia.  ivb
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3461,7 +4043,7 @@ msgstr ""
 "%s\n"
 
 # Multilínia.  ivb
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3487,7 +4069,8 @@ msgstr ""
 # Multilínia.  ivb
 #: src/write-qt.c:694
 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 ""
@@ -3507,13 +4090,13 @@ msgstr ""
 "d’ISO‐8859‐1, però el format de catàleg de missatges de Qt només\n"
 "permet l’ús d’Unicode a les cadenes traduïdes, no a les no traduïdes.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "error en escriure al subprocés «%s»"
 
 # Multilínia.  ivb
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3522,7 +4105,7 @@ msgstr ""
 "el format «.resources» de C# no permet l’ús de contexts.\n"
 
 # Multilínia.  ivb
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3531,7 +4114,7 @@ msgstr ""
 "format «.resources» de C# no permet el tractament de plurals.\n"
 
 # Multilínia.  ivb
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3540,7 +4123,7 @@ msgstr ""
 "el format de catàleg de missatges de Tcl no permet l’ús de contexts.\n"
 
 # Multilínia.  ivb
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3549,37 +4132,58 @@ msgstr ""
 "format de catàleg de missatges de Tcl no permet el tractament de\n"
 "plurals.\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, 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:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avís: l’expressió regular no està terminada"
 
-#: src/x-c.c:1153
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "avís: el caràcter Unicode no és vàlid"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
 
-#: src/x-c.c:1464 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: avís: el literal cadena no està terminat"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: avís: el literal cadena no està terminat"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: avís: el literal cadena no està terminat"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, 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:1520 src/x-c.c:1571 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no està terminat"
 
-#: src/x-csharp.c:225 src/xgettext.c:2168
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
-msgstr "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code»."
+msgstr ""
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code»."
 
 # Multilínia.  ivb
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3590,7 +4194,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3600,7 +4204,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3610,7 +4214,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3620,13 +4224,13 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # La funció.  ivb
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ha fallat iconv()"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3635,63 +4239,464 @@ 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:1391 src/x-python.c:1139
-#, 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:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: avís: la constant cadena no està terminada"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, 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:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
 
-#: src/x-glade.c:296
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+"«%s» no és nom de codificació vàlid, s’emprarà ASCII com a alternativa\n"
+
+# Realment és una comprovació tipogràfica.  ivb
+#: src/xgettext.c:637
+#, c-format
+msgid "syntax check '%s' unknown"
+msgstr "la comprovació tipogràfica «%s» no és coneguda"
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr "el tipus d’acabament de frase «%s» no és conegut"
+
+#: src/xgettext.c:701
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "manca el context de la cadena extreta de l’element «%s»"
+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/x-glade.c:418
+#: src/xgettext.c:705
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "no es permet l’element arrel «%s» en un fitxer Glade vàlid"
+msgid "xgettext cannot work without keywords to look for"
+msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-# Crec que no hauria de tenir traducció.  ivb
-#: src/x-glade.c:573 src/x-glade.c:580
+#: src/xgettext.c:839
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr "avís: el fitxer «%s» de regles ITS no existeix"
 
-# Multilínia.  L’argument és el nom del programa.  ivb
-#: src/x-glade.c:607
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"No es permet l’ús del llenguatge «glade».  «%s» fa ús d’«expat».\n"
-"Aquesta versió ha estat construïda sense «expat».\n"
+"avís: el fitxer «%s» de regles ITS no existeix; comproveu la vostra "
+"instal·lació de «gettext»"
 
-#: src/x-java.c:494
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
+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:1027
+#, 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:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NOM\n"
+"                       Empra «NOM.po» com a eixida (en lloc de «messages."
+"po»).\n"
+
+#: src/xgettext.c:1052
+#, 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:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=DIRECTORI\n"
+"                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
+
+# Es refereix al llenguatge de programació.  ivb
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
+
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=NOM    Reconeix el llenguatge especificat (C, C++,\n"
+"                       ObjectiveC, PO, Shell, Python, Lisp, EmacsLisp, "
+"librep,\n"
+"                       Scheme, Smalltalk, Java, JavaProperties, C#, awk, "
+"YCP,\n"
+"                       Tcl, Perl, PHP, GCC-source, NXStringTable, RST, "
+"Glade,\n"
+"                       Lua, JavaScript, Vala, Desktop).\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++            Equival a «--language=C++».\n"
+
+#: src/xgettext.c:1070
+#, c-format
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Per defecte s’endevina el llenguatge fent servir l’extensió del nom del "
+"fitxer\n"
+"d’entrada.\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
+"                       Python, Tcl i Glade).\n"
+
+#: src/xgettext.c:1078
+#, 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:1083
+#, 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:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr ""
+"  -x, --exclude-file=FITXER.po\n"
+"                       No extreu les entrades que ja es troben al FITXER.po\n"
+"                       indicat.\n"
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cETIQUETA, --add-comments=ETIQUETA\n"
+"                       Inclou al fitxer d’eixida els blocs de comentaris "
+"que\n"
+"                       comencen amb l’ETIQUETA i que precedeixen les línies\n"
+"                       amb una paraula clau.\n"
+"  -c, --add-comments    Inclou al fitxer d’eixida tots els blocs de "
+"comentaris\n"
+"                       que precedeixen les línies amb una paraula clau.\n"
+
+# Realment és una comprovació tipogràfica.  ivb
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+"      --check=NOM      Realitza una comprovació tipogràfica sobre els\n"
+"                       missatges: «ellipsis-unicode», «space-ellipsis»,\n"
+"                       «quote-unicode» o «bullet-unicode».\n"
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+"      --sentence-end=TIPUS\n"
+"                       Indica el TIPUS d’acabament de frase: «single-space»\n"
+"                       (un sol espai, per defecte) o «double-space» (dos\n"
+"                       espais).\n"
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Opcions específiques del llenguatge:\n"
+
+#: src/xgettext.c:1103
+#, 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:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                       (Només per als llenguatges C, C++, ObjectiveC, "
+"Shell,\n"
+"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
+"awk,\n"
+"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
+"                       Vala.)\n"
+
+# No mola pq va darrere d’un punt…  ivb
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                       (Només per als llenguatges C, C++, ObjectiveC, "
+"Shell,\n"
+"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
+"awk,\n"
+"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
+"                       Vala, Desktop.)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=PARAULA:ARG:INDICADOR\n"
+"                       Indicador addicional per a les cadenes que es troben "
+"a\n"
+"                       l’argument ARG de la paraula clau PARAULA.\n"
+
+# No mola pq va darrere d’un punt…  ivb
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                       (Només per als llenguatges C, C++, ObjectiveC, "
+"Shell,\n"
+"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
+"awk,\n"
+"                       YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript i\n"
+"                       Vala.)\n"
+
+#: src/xgettext.c:1126
+#, 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:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr ""
+"                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FITXER     Aplica les regles ITS del FITXER.\n"
+
+# No mola pq va darrere d’un punt…  ivb
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                       (Només per a llenguatges basats en XML.)\n"
+
+#: src/xgettext.c:1134
+#, 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:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                       (Només per al llenguatge C++.)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
+
+#: src/xgettext.c:1142
+#, 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:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug          Escriu unes marques més detallades de reconeixement "
+"de\n"
+"                       cadenes de format.\n"
+
+#: src/xgettext.c:1171
+#, 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:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --itstool        Escriu comentaris adequats per a «itstool».\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+"      --copyright-holder=CADENA\n"
+"                       Estableix a l’eixida la propietària o propietari del\n"
+"                       copyright.\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user    Omet a l’eixida la nota de copyright de la FSF, per "
+"a\n"
+"                       uns usuaris diferents.\n"
+
+#: src/xgettext.c:1192
+#, 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:1194
+#, 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:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=ADREÇA@CORREU\n"
+"                       Indica l’adreça on informar dels errors de les "
+"cadenes\n"
+"                       «msgid».\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[CADENA], --msgstr-prefix[=CADENA]\n"
+"                       Empra la CADENA (o la cadena buida) com a prefix "
+"dels\n"
+"                       valors les entrades «msgstr».\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[CADENA], --msgstr-suffix[=CADENA]\n"
+"                       Empra la CADENA (o la cadena buida) com a sufix dels\n"
+"                       valors les entrades «msgstr».\n"
+
+# Missatge d’error.  ivb
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"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:1695
+msgid "standard input"
+msgstr "entrada estàndard"
+
+# Multilínia.  ivb
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"No s’ha especificat l’opció «--msgid-bugs-address».  Si useu un fitxer\n"
+"«Makevars», per favor especifiqueu‐hi la variable MSGID_BUGS_ADDRESS;\n"
+"altrament especifiqueu una opció «--msgid-bugs-address» a la línia\n"
+"d’ordres.\n"
+
+# Llenguatge de programació.  ivb
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "el llenguatge «%s» no és conegut"
 
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
-msgstr "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+msgstr ""
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3702,7 +4707,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3712,7 +4717,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3722,7 +4727,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3732,7 +4737,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3741,58 +4746,59 @@ 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-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
 
 # No empra quote().  ivb
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: avís: no es permet «%s»"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: avís: l’etiquetatge XML no està terminat"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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"
+msgstr ""
+"%s:%d: no s’ha trobat el terminador de cadena «%s» abans del final de fitxer"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, 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:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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"
@@ -3800,9 +4806,14 @@ msgstr "%s:%d: la interpolació «\\U» del caràcter de 8 bits «%c» no és v�
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
 #: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
 "«--from-code» o mitjançant un comentari com es descriu en\n"
@@ -3810,11 +4821,16 @@ msgstr ""
 
 # Multilínia.  ivb
 #: src/x-python.c:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: La seqüència multioctet no és vàlida.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
@@ -3824,11 +4840,16 @@ msgstr ""
 # Multilínia.  ivb
 # Hau!  ivb
 #: src/x-python.c:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: La seqüència multioctet llarga no és completa.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
@@ -3837,11 +4858,16 @@ msgstr ""
 
 # Multilínia.  ivb
 #: src/x-python.c:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Hi ha una seqüència multioctet incompleta al final del fitxer.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
@@ -3850,11 +4876,16 @@ msgstr ""
 
 # Multilínia.  ivb
 #: src/x-python.c:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Hi ha una seqüència multioctet incompleta al final de la línia.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
@@ -3863,11 +4894,16 @@ msgstr ""
 
 # Multilínia.  ivb
 #: src/x-python.c:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: La seqüència multioctet no és vàlida.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb\n"
@@ -3875,477 +4911,300 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # No multilínia.  ivb
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, 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:116
 #, 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:180
 #, 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:215
 #, 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
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; useu «eval_gettext» al seu lloc"
-
-#: src/x-vala.c:414
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
-
-#: src/xgettext.c:555
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "«%s» no és nom de codificació vàlid, s’emprarà ASCII com a alternativa\n"
-
-# Realment és una comprovació tipogràfica.  ivb
-#: src/xgettext.c:624
-#, c-format
-msgid "syntax check '%s' unknown"
-msgstr "la comprovació tipogràfica «%s» no és coneguda"
-
-#: src/xgettext.c:633
-#, c-format
-msgid "sentence end type '%s' unknown"
-msgstr "el tipus d’acabament de frase «%s» no és conegut"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: la definició de cadena no és vàlida"
 
-#: src/xgettext.c:679
-#, 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/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: la definició de cadena no és vàlida"
 
-#: src/xgettext.c:684
+#: src/x-rst.c:691
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "«xgettext» no funciona sense paraules clau que cercar"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/xgettext.c:839
+# És una funció d’intèrpret.  ivb
+#: src/x-sh.c:1101
 #, 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»"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
+"useu «eval_gettext» al seu lloc"
 
-#: src/xgettext.c:908
+#: src/x-vala.c:616
 #, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Extreu les cadenes traduïbles dels fitxers d’entrada indicats.\n"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
 
-#: src/xgettext.c:931
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr ""
-"  -d, --default-domain=NOM\n"
-"                       Empra «NOM.po» com a eixida (en lloc de «messages.po»).\n"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<sense nom>"
 
-#: src/xgettext.c:933
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FITXER    Escriu l’eixida al FITXER especificat.\n"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "la seqüència UTF-8 no és vàlida"
 
-#: src/xgettext.c:935
+# No empra quote().  ivb
+# Caràcter entre cometes per llegibilitat.  ivb
+#: libgettextpo/markup.c:377
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr ""
-"  -p, --output-dir=DIRECTORI\n"
-"                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
+msgid "'%s' is not a valid name: %c"
+msgstr "«%s» no és un nom vàlid: «%c»"
 
-# Es refereix al llenguatge de programació.  ivb
-#: src/xgettext.c:940
+# No empra quote().  ivb
+#: libgettextpo/markup.c:397
 #, c-format
-msgid "Choice of input file language:\n"
-msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "«%s» no és un nom vàlid: «%c»"
 
-#: src/xgettext.c:942
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
 #, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
-msgstr ""
-"  -L, --language=NOM    Reconeix el llenguatge especificat (C, C++,\n"
-"                       ObjectiveC, PO, Shell, Python, Lisp, EmacsLisp, librep,\n"
-"                       Scheme, Smalltalk, Java, JavaProperties, C#, awk, YCP,\n"
-"                       Tcl, Perl, PHP, GCC-source, NXStringTable, RST, Glade,\n"
-"                       Lua, JavaScript, Vala, Desktop).\n"
+msgid "invalid character reference: %s"
+msgstr "la referència a caràcter no és vàlida: %s"
 
-#: src/xgettext.c:949
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++            Equival a «--language=C++».\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr "no és una especificació vàlida de número"
 
-#: src/xgettext.c:951
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr ""
-"Per defecte s’endevina el llenguatge fent servir l’extensió del nom del fitxer\n"
-"d’entrada.\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr "manca «;» al final"
 
-#: src/xgettext.c:956
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-"      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
-"                       Python, Tcl i Glade).\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr "s’ha trobat un caràcter no permès"
 
-#: src/xgettext.c:959
-#, 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"
+# Referència a caràcter.  ivb
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr "buida"
 
-#: src/xgettext.c:964
-#, 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"
+# Referència a caràcter.  ivb
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr "desconeguda"
 
-#: src/xgettext.c:966
+#: libgettextpo/markup.c:608
 #, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-"  -x, --exclude-file=FITXER.po\n"
-"                       No extreu les entrades que ja es troben al FITXER.po\n"
-"                       indicat.\n"
+msgid "invalid entity reference: %s"
+msgstr "la referència a entitat no és vàlida: %s"
 
-#: src/xgettext.c:968
-#, c-format
-msgid ""
-"  -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 ""
-"  -cETIQUETA, --add-comments=ETIQUETA\n"
-"                       Inclou al fitxer d’eixida els blocs de comentaris que\n"
-"                       comencen amb l’ETIQUETA i que precedeixen les línies\n"
-"                       amb una paraula clau.\n"
-"  -c, --add-comments    Inclou al fitxer d’eixida tots els blocs de comentaris\n"
-"                       que precedeixen les línies amb una paraula clau.\n"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr "el document ha de començar per un element"
 
-# Realment és una comprovació tipogràfica.  ivb
-#: src/xgettext.c:973
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
 #, c-format
-msgid ""
-"      --check=NAME            perform syntax check on messages\n"
-"                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
-msgstr ""
-"      --check=NOM      Realitza una comprovació tipogràfica sobre els\n"
-"                       missatges: «ellipsis-unicode», «space-ellipsis» o\n"
-"                       «quote-unicode».\n"
+msgid "invalid character after '%s'"
+msgstr "el caràcter que segueix «%s» no és vàlid"
 
-#: src/xgettext.c:977
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid ""
-"      --sentence-end=TYPE     type describing the end of sentence\n"
-"                                (single-space, which is the default, \n"
-"                                 or double-space)\n"
-msgstr ""
-"      --sentence-end=TIPUS\n"
-"                       Indica el TIPUS d’acabament de frase: «single-space»\n"
-"                       (un sol espai, per defecte) o «double-space» (dos\n"
-"                       espais).\n"
+msgid "missing '%c'"
+msgstr "manca «%c»"
 
-#: src/xgettext.c:982
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid "Language specific options:\n"
-msgstr "Opcions específiques del llenguatge:\n"
+msgid "missing '%c' or '%c'"
+msgstr "manca «%c» o «%c»"
 
-#: src/xgettext.c:984
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all    Extreu totes les cadenes.\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr "(un nom d’element que es tanca)"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:986
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk,\n"
-"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
-"                       Vala.)\n"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr "l’element es troba tancat"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:994
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
-msgstr ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk,\n"
-"                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
-"                       Vala, Desktop.)\n"
+# Condició d’error.  ivb
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr "el document és buit"
 
-#: src/xgettext.c:999
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
-msgstr ""
-"      --flag=PARAULA:ARG:INDICADOR\n"
-"                       Indicador addicional per a les cadenes que es troben a\n"
-"                       l’argument ARG de la paraula clau PARAULA.\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr "després de «<»"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1002
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk,\n"
-"                       YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript i\n"
-"                       Vala.)\n"
+# Condició d’error.  ivb
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr "encara hi ha elements oberts"
 
-#: src/xgettext.c:1007
-#, 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"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr "manca «>»"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1009
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr "dins d’un nom d’element"
 
-#: src/xgettext.c:1011
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt             Reconeix les cadenes de format de Qt.\n"
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "dins d’un nom d’atribut"
 
-# No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1013 src/xgettext.c:1017 src/xgettext.c:1021
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                       (Només per al llenguatge C++.)\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr "dins d’una obertura d’etiqueta"
 
-#: src/xgettext.c:1015
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr "després de «=»"
 
-#: src/xgettext.c:1019
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr "dins d’un valor d’atribut"
 
-# Simplement mireu l’info.  ivb
-#: src/xgettext.c:1023
-#, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-"      --debug          Escriu unes marques més detallades de reconeixement de\n"
-"                       cadenes de format.\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr "dins d’un tancament d’etiqueta"
 
-#: src/xgettext.c:1048
-#, 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"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr "dins d’un comentari o instrucció de processament"
 
-#: src/xgettext.c:1063
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=CADENA\n"
-"                       Estableix a l’eixida la propietària o propietari del\n"
-"                       copyright.\n"
+msgid "document ended unexpectedly: %s"
+msgstr "el document ha acabat inesperadament: %s"
 
-#: src/xgettext.c:1065
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-"      --foreign-user    Omet a l’eixida la nota de copyright de la FSF, per a\n"
-"                       uns usuaris diferents.\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l’opció «--%s» no admet arguments\n"
 
-#: src/xgettext.c:1067
 #, 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"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: l’opció «--%s» no és reconeguda\n"
 
-#: src/xgettext.c:1069
 #, 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"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: l’opció «-W %s» és ambígua\n"
 
-#: src/xgettext.c:1071
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-"      --msgid-bugs-address=ADREÇA@CORREU\n"
-"                       Indica l’adreça on informar dels errors de les cadenes\n"
-"                       «msgid».\n"
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: l’opció «-W %s» no admet arguments\n"
 
-#: src/xgettext.c:1073
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -m[CADENA], --msgstr-prefix[=CADENA]\n"
-"                       Empra la CADENA (o la cadena buida) com a prefix dels\n"
-"                       valors les entrades «msgstr».\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: l’opció «-W %s» necessita un argument\n"
 
-#: src/xgettext.c:1076
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -M[CADENA], --msgstr-suffix[=CADENA]\n"
-"                       Empra la CADENA (o la cadena buida) com a sufix dels\n"
-"                       valors les entrades «msgstr».\n"
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "avís: la capçalera del fitxer PO està marcada com a difusa\n"
 
-# Missatge d’error.  ivb
-#: src/xgettext.c:1902
 #, c-format
-msgid "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:2027
-msgid "standard input"
-msgstr "entrada estàndard"
+#~ 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"
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2133
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Hi ha un caràcter no‐ASCII en «%s%s»."
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Hi ha un caràcter no‐ASCII en «%s%s»."
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2137
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Hi ha un comentari no‐ASCII en o abans de «%s%s»."
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Hi ha un comentari no‐ASCII en o abans de «%s%s»."
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2142
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Hi ha una cadena no‐ASCII en «%s%s»."
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Hi ha una cadena no‐ASCII en «%s%s»."
 
-#: src/xgettext.c:2248 src/xgettext.c:2281 src/xgettext.c:2346
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: avís: "
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: avís: "
 
 # Multilínia.  ivb
 # ivb (2002/12/16)
 # 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:2251
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Tot i ser emprada a la posició d’una cadena de format, %s no és una cadena vàlida de format de %s.  Motiu: %s\n"
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Tot i ser emprada a la posició d’una cadena de format, %s no és una "
+#~ "cadena vàlida de format de %s.  Motiu: %s\n"
 
 # Multilínia.  ivb
 # ivb (2002/12/16)
 # 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:2252
 #, c-format
-msgid "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"
+#~ msgid ""
+#~ "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:2283
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"La cadena de format «%s», amb arguments sense nom, no pot ser\n"
-"localitzada adequadament, ja que el traductor no pot reordenar‐ne els\n"
-"arguments.  Per favor, considereu emprar una cadena de format amb\n"
-"arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "La cadena de format «%s», amb arguments sense nom, no pot ser\n"
+#~ "localitzada adequadament, ja que el traductor no pot reordenar‐ne els\n"
+#~ "arguments.  Per favor, considereu emprar una cadena de format amb\n"
+#~ "arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2348
-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 ""
-"El «msgid» és buit.  Açò es troba reservat pel «gettext» de GNU:\n"
-"«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
-"cadena buida.\n"
-
-#: src/xgettext.c:3085
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "l’especificació d’argument per a la paraula clau «%.*s» és ambígua"
+#~ 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 ""
+#~ "El «msgid» és buit.  Açò es troba reservat pel «gettext» de GNU:\n"
+#~ "«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
+#~ "cadena buida.\n"
 
-#: src/xgettext.c:3112
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "avís: manca el context de la paraula clau «%.*s»"
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "l’especificació d’argument per a la paraula clau «%.*s» és ambígua"
 
-#: src/xgettext.c:3137
 #, 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»"
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "avís: manca el context de la paraula clau «%.*s»"
 
-#: src/xgettext.c:3158
 #, 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:3533
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"No s’ha especificat l’opció «--msgid-bugs-address».  Si useu un fitxer\n"
-"«Makevars», per favor especifiqueu‐hi la variable MSGID_BUGS_ADDRESS;\n"
-"altrament especifiqueu una opció «--msgid-bugs-address» a la línia\n"
-"d’ordres.\n"
+#~ 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»"
 
-# Llenguatge de programació.  ivb
-#: src/xgettext.c:3753
 #, c-format
-msgid "language '%s' unknown"
-msgstr "el llenguatge «%s» no és conegut"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<sense nom>"
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "els contexts de les formes singular i plural no corcorden"
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index fdb2de21a..4203cda3b 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -12,7 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
-"POT-Creation-Date: 2001-05-23 23:03+0200\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -20,214 +21,1599 @@ msgstr ""
 "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"
+"X-Bugs: Report translation errors to the Language-Team address.\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:134
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr ""
+
+#: gnulib-lib/argmatch.c:135
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr ""
+
+#: gnulib-lib/argmatch.c:154
+msgid "Valid arguments are:"
+msgstr ""
+
+#: gnulib-lib/clean-temp.c:325
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr ""
+
+# src/message.c:1115
+#: gnulib-lib/clean-temp.c:339
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+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:435
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot remove temporary file %s"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+#: gnulib-lib/clean-temp.c:450
+#, c-format
+msgid "cannot remove temporary directory %s"
+msgstr ""
+
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr ""
+
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
+#, c-format
+msgid "preserving permissions for %s"
+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:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
+
+#: gnulib-lib/copy-file.c:179
+#, c-format
+msgid "cannot open backup file %s for writing"
+msgstr ""
+
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error reading %s"
+msgstr "chyba p�i �ten� \"%s\""
+
+# src/message.c:1182
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error while writing \"%s\" file"
+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:191
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error after reading %s"
+msgstr "chyba p�i �ten� \"%s\""
+
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
+#, c-format
+msgid "fdopen() failed"
+msgstr ""
+
+#: gnulib-lib/csharpcomp.c:443
+#, c-format
+msgid "C# compiler not found, try installing mono"
+msgstr ""
+
+#: gnulib-lib/csharpexec.c:255
+#, c-format
+msgid "C# virtual machine not found, try installing mono"
+msgstr ""
 
 # lib/error.c:91
-#: lib/error.c:115
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Nezn�m� syst�mov� chyba"
 
-# lib/getopt.c:628
-#: lib/getopt.c:691
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s subprocess failed"
+msgstr ""
+
+# lib/getopt.c:628
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: p�ep�na� `%s' nen� jednozna�n�\n"
 
-# lib/getopt.c:652
-#: lib/getopt.c:716
-#, 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:628
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: p�ep�na� `%s' nen� jednozna�n�\n"
+
+# lib/getopt.c:707
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nezn�m� p�ep�na� `%c%s'\n"
 
 # lib/getopt.c:657
-#: lib/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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
-#: lib/getopt.c:739 lib/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
-# lib/getopt.c:703
-#. --option
-#: lib/getopt.c:768
+# lib/getopt.c:736
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: p�ep�na� vy�aduje argument -- %c\n"
+
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nezn�m� p�ep�na� `--%s'\n"
+msgid "invalid source_version argument to compile_java_class"
+msgstr ""
 
-# lib/getopt.c:707
-#. +option or -option
-#: lib/getopt.c:772
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nezn�m� p�ep�na� `%c%s'\n"
+msgid "invalid target_version argument to compile_java_class"
+msgstr ""
 
-# lib/getopt.c:733
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:798
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+msgid "failed to create \"%s\""
+msgstr ""
 
-# lib/getopt.c:736
-#: lib/getopt.c:801
+# src/message.c:1182
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+msgid "error while writing \"%s\" file"
+msgstr "chyba p�i z�pisu do souboru \"%s\""
 
-# lib/getopt.c:766 lib/getopt.c:896
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:831 lib/getopt.c:961
+#: gnulib-lib/javacomp.c:2436
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: p�ep�na� vy�aduje argument -- %c\n"
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr ""
 
-# lib/getopt.c:813
-#: lib/getopt.c:878
+#: gnulib-lib/javaexec.c:417
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: p�ep�na� `-W %s' nen� jednozna�n�\n"
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr ""
 
-# lib/getopt.c:831
-#: lib/getopt.c:896
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, 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"
+msgid "%s subprocess I/O error"
+msgstr ""
 
 # lib/xmalloc.c:82
-#: lib/obstack.c:474 lib/xmalloc.c:86 src/po.c:308 src/po.c:381 src/po.c:389
-#: src/po.c:395 src/po.c:415 src/po.c:422 src/po.c:427 src/po.c:444
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#, c-format
 msgid "memory exhausted"
 msgstr "pam� vy�erp�na"
 
-# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
-# src/msgunfmt.c:175 src/xgettext.c:394
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#.
+#. If you don't know what to put here, please see
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: gnulib-lib/quotearg.c:362
+msgid "`"
+msgstr ""
+
+#: gnulib-lib/quotearg.c:363
+msgid "'"
+msgstr ""
+
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr ""
+
+# src/message.c:1115
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot create pipe"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+#: gnulib-lib/w32spawn.h:49
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr ""
+
+# src/message.c:1115
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
+#, c-format
+msgid "%s subprocess"
+msgstr ""
+
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr ""
+
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+# 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/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr ""
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+
+# src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
+# src/msgunfmt.c:234 src/xgettext.c:582
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+#, fuzzy
+#| msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"  Chyby v programu oznamujte na adrese <bug-gnu-utils@prep.ai.mit.edu> "
+"(pouze\n"
+"anglicky), p�ipom�nky k p�ekladu zas�lejte na adresu <cs@li.org> (�esky).\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"  Copyright (C) %s Free Software Foundation, Inc.\n"
-"  Toto je voln� programov� vybaven�; podm�nky pro kop�rov�n� a roz�i�ov�n�\n"
-"naleznete ve zdrojov�ch textech. Toto programov� vybaven� je zcela BEZ Z�RUKY,\n"
-"a to i bez z�ruky PRODEJNOSTI nebo VHODNOSTI PRO N�JAK� KONKR�TN� ��EL.\n"
 
 # 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/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr ""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+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/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
+
+# src/msgfmt.c:909
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 "format specifications for argument %lu are not the same"
+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:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "format specifications for argument %lu are not the same"
+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:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 for argument %lu 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
+#, c-format
+msgid "The directive number %u starts with | but does not end with |."
+msgstr ""
+
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+
+#: src/format-c.c:39
+#, c-format
+msgid "In the directive number %u, the token after '<' is not followed by '>'."
+msgstr ""
+
+#: src/format-c.c:42 src/format-gfc-internal.c:289
+#, c-format
+msgid "The string refers to argument number %u but ignores argument number %u."
+msgstr ""
+
+# src/msgfmt.c:892
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, fuzzy, c-format
+#| msgid ""
+#| "number of format specifications in `msgid' and `msgstr' 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:85 src/format-java.c:205
+#, c-format
+msgid "In the directive number %u, '{' is not followed by an argument number."
+msgstr ""
+
+#: src/format-csharp.c:106
+#, c-format
+msgid "In the directive number %u, ',' is not followed by a number."
+msgstr ""
+
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+
+#: src/format-csharp.c:136
+#, c-format
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+
+#: src/format-csharp.c:137
+#, c-format
+msgid "The directive number %u ends with an invalid character instead of '}'."
+msgstr ""
+
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+
+#: src/format-csharp.c:159
+#, c-format
+msgid "The string contains a lone '}' after directive number %u."
+msgstr ""
+
+#: 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:292
+#, c-format
+msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgstr ""
+
+#: 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:398
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: 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:463
+#, c-format
+msgid "In the directive number %u, flags are not allowed before '%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:677
+#, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr ""
+
+#: src/format-gcc-internal.c:680
+#, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr ""
+
+#: src/format-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr ""
+
+#: src/format-invalid.h:22
+msgid "The string ends in the middle of a directive."
+msgstr ""
+
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+
+#: src/format-invalid.h:28
+#, c-format
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+
+#: src/format-invalid.h:30
+#, c-format
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+
+#: src/format-invalid.h:32
+#, c-format
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+
+#: src/format-invalid.h:36
+#, c-format
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+
+#: src/format-invalid.h:37
+#, c-format
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+
+#: src/format-invalid.h:40
+#, c-format
+msgid "The string refers to argument number %u in incompatible ways."
+msgstr ""
+
+#: src/format-java.c:240
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
+#, c-format
+msgid "In the directive number %u, \"%s\" is not followed by a comma."
+msgstr ""
+
+#: src/format-java.c:274
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+
+#: src/format-java.c:323
+#, c-format
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+
+#: src/format-java.c:572
+#, c-format
+msgid "In the directive number %u, a choice contains no number."
+msgstr ""
+
+#: src/format-java.c:583
+#, c-format
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+
+# src/msgfmt.c:909
+#: src/format-java.c:745
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+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:756
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+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:776
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu 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-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+# src/msgfmt.c:909
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "chyba p�i �ten� \"%s\""
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
+#, c-format
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
+#, c-format
+msgid "In the directive number %u, '%c' is not followed by a digit."
+msgstr ""
+
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
+#, c-format
+msgid "In the directive number %u, the argument %d is negative."
+msgstr ""
+
+#: src/format-lisp.c:2808
+msgid "The string ends in the middle of a ~/.../ directive."
+msgstr ""
+
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
+#, c-format
+msgid "Found '~%c' without matching '~%c'."
+msgstr ""
+
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
+#, c-format
+msgid "In the directive number %u, both the @ and the : modifiers are given."
+msgstr ""
+
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
+#, c-format
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
+#, c-format
+msgid "In the directive number %u, '~;' is used in an invalid position."
+msgstr ""
+
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
+msgid "The string refers to some argument in incompatible ways."
+msgstr ""
+
+# src/msgfmt.c:909
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+msgid "format specifications in '%s' and '%s' are not equivalent"
+msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+# src/msgfmt.c:909
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:308
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+
+#: src/format-python-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
+#: 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:354
+#, c-format
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr ""
+
+#: src/format-python.c:430
+#, c-format
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+
+#: src/format-python.c:437
+#, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+
+# src/msgfmt.c:909
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+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:494
+#, fuzzy, c-format
+#| msgid "format specifications for argument %lu are not the same"
+msgid ""
+"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 ""
+"'%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
+msgid "The string refers to a shell variable with a non-ASCII name."
+msgstr ""
+
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+
+#: src/format-sh.c:85
+msgid "The string refers to a shell variable with an empty name."
+msgstr ""
+
+#: src/format-ycp.c:90
+#, c-format
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+
+#: src/format-ycp.c:91
+#, c-format
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
+msgid "Bruno Haible"
+msgstr ""
+
 # src/gettextp.c:164
-#: src/gettext.c:163 src/ngettext.c:137
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
+#, c-format
 msgid "too many arguments"
 msgstr "p��li� mnoho argument�"
 
-# src/gettextp.c:154
-#: src/gettext.c:173 src/ngettext.c:149
-msgid "missing arguments"
-msgstr "chyb� argumenty"
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION]\n"
+msgstr ""
 
-# 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/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
+#: src/hostname.c:216
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
+msgid "Print the machine's hostname.\n"
+msgstr ""
 
-# src/gettextp.c:233
-#: src/gettext.c:250
-#, c-format, no-wrap
+#: src/hostname.c:219
+#, c-format
+msgid "Output format:\n"
+msgstr ""
+
+#: src/hostname.c:221
+#, c-format
+msgid "  -s, --short                 short host name\n"
+msgstr ""
+
+#: src/hostname.c:223
+#, c-format
 msgid ""
-"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
-msgstr ""
-"Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID ] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTOV�DOM�NA nastav� textovou dom�nu, ze kter� je MSGID\n"
-"  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
-"  -E                         (ignorov�n - kv�li kompatibilit�)\n"
-"  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
-"  -n                         potla�� nov� ��dky na konci zpr�vy\n"
-"  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
-"  [TEXTOV�DOM�NA] MSGID      vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
-"                             MSGID z TEXTOV�DOM�NY\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
+"                                name, and aliases\n"
+msgstr ""
 
-# src/gettextp.c:245
-#: src/gettext.c:262
+#: src/hostname.c:226
+#, c-format
+msgid "  -i, --ip-address            addresses for the hostname\n"
+msgstr ""
+
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
+#, c-format, no-wrap
+msgid "Informative output:\n"
+msgstr ""
+
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr ""
+
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
+
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr ""
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr ""
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr ""
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+# src/message.c:1115
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#, c-format
+msgid "at most one input file allowed"
+msgstr ""
+
+# src/xgettext.c:378 src/xgettext.c:382
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
+#, c-format
+msgid "%s and %s are mutually exclusive"
+msgstr "%s a %s se vz�jemn� vylu�uj�"
+
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#, c-format
+msgid "Usage: %s [OPTION] [INPUTFILE]\n"
+msgstr ""
+
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
-"\n"
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
-"Standard search directory: %s\n"
+"Filters the messages of a translation catalog according to their attributes,\n"
+"and manipulates the attributes.\n"
 msgstr ""
+
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
+#, 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:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
+#, fuzzy, c-format
+#| msgid "no input file given"
+msgid "Input file location:\n"
+msgstr "vstupn� soubor nen� zad�n"
+
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#, c-format
+msgid "  INPUTFILE                   input PO file\n"
+msgstr ""
+
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
+#, c-format
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#, c-format
+msgid "If no input file is given or if it is -, standard input is read.\n"
+msgstr ""
+
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
+#, c-format
+msgid "Output file location:\n"
+msgstr ""
+
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified file\n"
+msgstr ""
+
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
+#, 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:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
+#, c-format
+msgid "Message selection:\n"
+msgstr ""
+
+#: src/msgattrib.c:452
+#, c-format
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+
+#: src/msgattrib.c:454
+#, c-format
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+
+#: src/msgattrib.c:456
+#, c-format
+msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgstr ""
+
+#: src/msgattrib.c:458
+#, c-format
+msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+msgstr ""
+
+#: src/msgattrib.c:460
+#, c-format
+msgid "      --no-obsolete           remove obsolete #~ messages\n"
+msgstr ""
+
+#: src/msgattrib.c:462
+#, c-format
+msgid "      --only-obsolete         keep obsolete #~ messages\n"
+msgstr ""
+
+#: src/msgattrib.c:465
+#, c-format
+msgid "Attribute manipulation:\n"
+msgstr ""
+
+#: src/msgattrib.c:467
+#, c-format
+msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
+msgstr ""
+
+#: src/msgattrib.c:469
+#, c-format
+msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+msgstr ""
+
+#: src/msgattrib.c:471
+#, c-format
+msgid "      --set-obsolete          set all messages obsolete\n"
+msgstr ""
+
+#: src/msgattrib.c:473
+#, c-format
+msgid "      --clear-obsolete        set all messages non-obsolete\n"
+msgstr ""
+
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
+#, c-format
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+
+#: src/msgattrib.c:484
+#, c-format
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+
+#: src/msgattrib.c:486
+#, c-format
+msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+
+#: src/msgattrib.c:488
+#, c-format
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
+#, c-format
+msgid "Input file syntax:\n"
+msgstr ""
+
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
+#, c-format
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
+#, c-format
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
+#, c-format
+msgid "Output details:\n"
+msgstr ""
+
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
+#, c-format
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
+#, c-format
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
+#, c-format
+msgid "      --force-po              write PO file even if empty\n"
+msgstr ""
+
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
+#, c-format
+msgid "  -i, --indent                write the .po file using indented style\n"
+msgstr ""
+
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
+#, c-format
+msgid "      --no-location           do not write '#: filename:line' lines\n"
+msgstr ""
+
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
+#, c-format
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
+#, c-format
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
+#, c-format
+msgid "  -p, --properties-output     write out a Java .properties file\n"
+msgstr ""
+
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
+#, c-format
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
+#, c-format
+msgid "  -w, --width=NUMBER          set output page width\n"
+msgstr ""
+
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
+#, 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:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
+#, c-format
+msgid "  -s, --sort-output           generate sorted output\n"
+msgstr ""
+
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
+#, c-format
+msgid "  -F, --sort-by-file          sort output by file location\n"
+msgstr ""
+
+#: 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:366 src/msgcomm.c:358 src/xgettext.c:1023
+#, c-format
+msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
+msgstr ""
+
+#: src/msgcat.c:371
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "  -V, --version                  output version information and exit\n"
+#| "  -w, --width=NUMBER             set output page width\n"
+#| "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#| "                                 definitions, defaults to infinite if not\n"
+#| "                                 set\n"
+#| "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#| "                                 definitions, defaults to 1 if not set\n"
+#| "\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "preserved.\n"
+msgid ""
+"Concatenates and merges the specified PO files.\n"
+"Find messages which are common to two or more of the specified PO files.\n"
+"By using the --more-than option, greater commonality may be requested\n"
+"before messages are printed.  Conversely, the --less-than option may be\n"
+"used to specify less commonality before messages are printed (i.e.\n"
+"--less-than=2 will only print the unique messages).  Translations,\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
+msgstr ""
+"  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
+"  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
+"  -<, --less-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� m�n� ne�\n"
+"                              ��SLO kr�t, implicitn� nastaveno nekone�no\n"
+"  ->, --more-than=��SLO       vyp��e pouze zpr�vy, kter� se vyskytuj� v�ce ne�\n"
+"                              ��SLO kr�t, implicitn� nastaveno na 1\n"
 "\n"
-"  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
-"prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
-"v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
-"v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
-"  Je-li pou�it argument -s, program se chov� jako p��kaz `echo'. M�sto toto,\n"
-"aby pouze kop�roval svoje argumenty do stdout, vyp��e p�eklad zpr�v ze\n"
-"zvolen�ho katalogu. \n"
-"\n"
-"  Standardn� prohled�van� adres��: %s\n"
+"  Nalezne zpr�vy, kter� jsou spole�n� pro dva nebo v�ce zadan�ch .po soubor�.\n"
+"Pou�it�m p�ep�na�e --more-than, lze dos�hnout zv�t�en� po�tu soubor�, kter�m\n"
+"mus� b�t zpr�va spole�n�. Naproti tomu p�ep�na� --less-than m��e b�t pou�it\n"
+"k v�pisu zpr�v, kter� jsou spole�n� m�n� ne� zadan�mu po�tu soubor� \n"
+"(--less-then=2 zp�sob� v�pis zpr�v, kter� jsou obsa�eny pouze v jednom\n"
+"souboru). P�eklady, koment��e a koment��e ze zdrojov�ch soubor� budou\n"
+"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/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
-# src/msgunfmt.c:234 src/xgettext.c:582
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
-msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
+#, c-format
+msgid "  INPUTFILE ...               input files\n"
+msgstr ""
+
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
+#, c-format
+msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgstr ""
+
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
+#, c-format
+msgid "If input file is -, standard input is read.\n"
+msgstr ""
+
+#: 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: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: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:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
+#, c-format
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
+#, c-format
+msgid ""
+"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
+"                              syntax\n"
+msgstr ""
+
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
+#, c-format
+msgid "  -t, --to-code=NAME          encoding for output\n"
+msgstr ""
+
+#: src/msgcat.c:429 src/msguniq.c:380
+#, 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:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --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:177 src/msgcomm.c:290 src/msgmerge.c:378
+msgid "Peter Miller"
 msgstr ""
-"  Chyby v programu oznamujte na adrese <bug-gnu-utils@prep.ai.mit.edu> (pouze\n"
-"anglicky), p�ipom�nky k p�ekladu zas�lejte na adresu <cs@li.org> (�esky).\n"
 
 # src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:156 src/msgmerge.c:271
+#: src/msgcmp.c:188 src/msgmerge.c:389
+#, c-format
 msgid "no input files given"
 msgstr "vstupn� soubory nejsou zad�ny"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:161 src/msgmerge.c:276
+#: src/msgcmp.c:193 src/msgmerge.c:394
+#, c-format
 msgid "exactly 2 input files required"
 msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
+#: src/msgcmp.c:212 src/msgmerge.c:540
+#, c-format
+msgid "Usage: %s [OPTION] def.po ref.pot\n"
+msgstr ""
+
 # src/msgcmp.c:186
-#: src/msgcmp.c:182
-#, c-format, no-wrap
+#: src/msgcmp.c:217
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Usage: %s [OPTION] def.po ref.po\n"
+#| "Mandatory arguments to long options are mandatory for short options too.\n"
+#| "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#| "  -h, --help                  display this help and exit\n"
+#| "  -V, --version               output version information and exit\n"
+#| "\n"
+#| "Compare two Uniforum style .po files to check that both contain the same\n"
+#| "set of msgid strings.  The def.po file is an existing PO file with the\n"
+#| "old translations.  The ref.po file is the last created PO file\n"
+#| "(generally by xgettext).  This is useful for checking that you have\n"
+#| "translated each and every message in your program.  Where an exact match\n"
+#| "cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgid ""
-"Usage: %s [OPTION] def.po ref.po\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"\n"
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
-"old translations.  The ref.po file is the last created PO file\n"
-"(generally by xgettext).  This is useful for checking that you have\n"
-"translated each and every message in your program.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+"translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+"file (generally created by xgettext).  This is useful for checking that\n"
+"you have translated each and every message in your program.  Where an exact\n"
+"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
 "  Argumenty po�adovan� dlouh�mi p�ep�na�i, jsou tak� po�adov�ny jejich\n"
@@ -244,29 +1630,81 @@ 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:231
+#, c-format
+msgid "  def.po                      translations\n"
+msgstr ""
+
+#: src/msgcmp.c:233
+#, c-format
+msgid "  ref.pot                     references to the sources\n"
+msgstr ""
+
+#: src/msgcmp.c:238 src/msgmerge.c:606
+#, c-format
+msgid "Operation modifiers:\n"
+msgstr ""
+
+#: src/msgcmp.c:240 src/msgmerge.c:608
+#, c-format
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:244
+#, c-format
+msgid "      --use-fuzzy             consider fuzzy entries\n"
+msgstr ""
+
+#: src/msgcmp.c:246
+#, c-format
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr ""
+
+# src/msgcmp.c:281
+#: src/msgcmp.c:324
+#, fuzzy, c-format
+#| msgid "warning: this message is not used"
+msgid "this message is untranslated"
+msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
+
+#: 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:255 src/msgmerge.c:741
+#: src/msgcmp.c:369 src/msgmerge.c:1576
+#, 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:257 src/msgmerge.c:743
+#: src/msgcmp.c:372 src/msgmerge.c:1579
+#, 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:263 src/msgmerge.c:770
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:277
+#: 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:283 src/po-lex.c:103
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -274,123 +1712,39 @@ msgstr[0] "nalezena %d z�va�n� chyba"
 msgstr[1] "nalezeny %d z�va�n� chyby"
 msgstr[2] "nalezeno %d z�va�n�ch chyb"
 
-# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
-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/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
-msgid "...this is the location of the first definition"
-msgstr "...toto je um�st�n� prvn� definice"
-
-# src/msgcmp.c:396 src/msgmerge.c:539
-#: src/msgcmp.c:397 src/msgmerge.c:561
-#, c-format
-msgid "this message has no definition in the \"%s\" domain"
-msgstr "tato zpr�va nem� ��dnou definici v dom�n� \"%s\""
-
-# src/xgettext.c:340 src/xgettext.c:1256
-#. We are about to construct the absolute path to the
-#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
-msgid "while preparing output"
-msgstr "p�i p��prav� v�stupu"
-
-# src/xgettext.c:378 src/xgettext.c:382
-#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
+#: src/msgcomm.c:315
 #, c-format
-msgid "%s and %s are mutually exclusive"
-msgstr "%s a %s se vz�jemn� vylu�uj�"
-
-#: src/msgcomm.c:323
 msgid "at least two files must be specified"
 msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
 
-#: src/msgcomm.c:334
-#, c-format
-msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "zad�no nemo�n� v�b�rov� krit�rium (%d < n < %d)"
-
-# src/xgettext.c:537
-#: src/msgcomm.c:382
-#, c-format, no-wrap
+#: src/msgcomm.c:363
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "  -V, --version                  output version information and exit\n"
+#| "  -w, --width=NUMBER             set output page width\n"
+#| "  -<, --less-than=NUMBER         print messages with less than this many\n"
+#| "                                 definitions, defaults to infinite if not\n"
+#| "                                 set\n"
+#| "  ->, --more-than=NUMBER         print messages with more than this many\n"
+#| "                                 definitions, defaults to 1 if not set\n"
+#| "\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "preserved.\n"
 msgid ""
-"Usage: %s [OPTION] INPUTFILE ...\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"      --force-po                 write PO file even if empty\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"  -h, --help                     display this help and exit\n"
-msgstr ""
-"Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
-"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
-"formy.\n"
-"\n"
-"  -d, --default-domain=JM�NO  zap��e v�stup do JM�NO.po (m�sto do messages.po)\n"
-"  -D, --directory=ADRES��     p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
-"                              vstupn�ch soubor�\n"
-"  -e, --no-escape             nepou��v� escape sekvence z C ve v�stupu\n"
-"                              (implicitn�)\n"
-"  -E, --escape                pou��v� C escape sekvence ve v�stupu, bez\n"
-"                              roz���en�ch znak�\n"
-"  -f, --files-from=SOUBOR     vezme seznam vstupn�ch soubor� ze SOUBORu\n"
-"      --force-po              vyp��e .po soubor, i kdy� je pr�zdn�\n"
-"  -F, --sort-by-file          se�ad� v�stup podle um�st�n� zpr�v ve zdrojov�ch\n"
-"                              souborech\n"
-"  -h, --help                  vyp��e tuto n�pov�du a ukon�� se\n"
-
-# src/xgettext.c:569
-#: src/msgcomm.c:394
-msgid ""
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-"  -s, --sort-output              generate sorted output and remove duplicates\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-"  -i, --indent                vyp��e .po soubor odsazovac�m stylem\n"
-"      --no-location           nevytv��� ��dky '#: filename:line'\n"
-"  -n, --add-location          vytv��� ��dky '#: jm�no_souboru:��dka' ��dky\n"
-"                              (implicitn�)\n"
-"      --omit-header           nevypisuje hlavi�ku s `msgid \"\"' polo�kou\n"
-"  -o, --output=SOUBOR         zap��e v�stup do ur�en�ho souboru\n"
-"  -p, --output-dir=ADRES��    v�stupn� soubory budou um�st�ny do tohoto\n"
-"                              adres��e\n"
-"  -s, --sort-output           generuje se�azen� v�stup bez duplicitn�ch zpr�v\n"
-"      --strict                vytvo�� v�stupn� soubor ve stylu Uniforum\n"
-"  -T, --trigraphs             rozum� ANSI C `trigraphs' na vstupu\n"
-"  -u, --unique                zkratka pro --less-than=2, v�stupem budou pouze\n"
-"                              zpr�vy obsa�en� v katalog�ch pouze jednou\n"
-
-#: src/msgcomm.c:407
-msgid ""
-"  -V, --version                  output version information and exit\n"
-"  -w, --width=NUMBER             set output page width\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 1 if not set\n"
-"\n"
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
-"preserved.\n"
+"cumulated.\n"
 msgstr ""
 "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
 "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
@@ -408,32 +1762,305 @@ 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/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/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
+#: src/msgcomm.c:401
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
+msgid ""
+"  ->, --more-than=NUMBER      print messages with more than this many\n"
+"                              definitions, defaults to 1 if not set\n"
+msgstr ""
 
-# src/xgettext.c:658 src/xgettext.c:968
-#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
-msgid "this file may not contain domain directives"
-msgstr "tento soubor nem��e obsahovat p��kazy pro dom�nu"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, c-format
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+
+#: src/msgconv.c:311
+#, c-format
+msgid "Converts a translation catalog to a different character encoding.\n"
+msgstr ""
+
+#: src/msgconv.c:335
+#, c-format
+msgid "Conversion target:\n"
+msgstr ""
+
+#: src/msgconv.c:339
+#, c-format
+msgid "The default encoding is the current locale's encoding.\n"
+msgstr ""
+
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
+#, c-format
+msgid "  -i, --indent                indented output style\n"
+msgstr ""
+
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
+#, c-format
+msgid "      --no-location           suppress '#: filename:line' lines\n"
+msgstr ""
+
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, c-format
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
+#, c-format
+msgid "      --strict                strict Uniforum output style\n"
+msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgfmt.c:286 src/xgettext.c:404
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
+#, c-format
 msgid "no input file given"
 msgstr "vstupn� soubor nen� zad�n"
 
-# src/msgfmt.c:321
-#: src/msgfmt.c:337
+# src/msgcmp.c:165 src/msgmerge.c:272
+#: src/msgen.c:263
+#, fuzzy, c-format
+#| msgid "exactly 2 input files required"
+msgid "exactly one input file required"
+msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
+
+#: src/msgen.c:304
 #, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
+msgid "Usage: %s [OPTION] INPUTFILE\n"
+msgstr ""
+
+#: src/msgen.c:309
+#, c-format, no-wrap
+msgid ""
+"Creates an English translation catalog.  The input file is the last\n"
+"created English PO file, or a PO Template file (generally created by\n"
+"xgettext).  Untranslated entries are assigned a translation that is\n"
+"identical to the msgid.\n"
+msgstr ""
+
+#: src/msgen.c:321
+#, c-format
+msgid "  INPUTFILE                   input PO or POT file\n"
+msgstr ""
+
+#: src/msgexec.c:201
+#, c-format
+msgid "missing command name"
+msgstr ""
+
+#: src/msgexec.c:262
+#, c-format
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+msgstr ""
+
+#: src/msgexec.c:267
+#, c-format, no-wrap
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input.  It is invoked once for each translation.  Its output becomes\n"
+"msgexec's output.  msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:276
+#, 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/xget-lex.c:150
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "standardn� vstup"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
+msgstr ""
+
+#: src/msgexec.c:291 src/msgfilter.c:426
+#, c-format
+msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgstr ""
+
+#: src/msgexec.c:355
+#, c-format
+msgid "write to stdout failed"
+msgstr ""
+
+# src/gettextp.c:154
+#: src/msgfilter.c:304
+#, fuzzy, c-format
+#| msgid "missing arguments"
+msgid "missing filter name"
+msgstr "chyb� argumenty"
+
+#: src/msgfilter.c:324
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "at least one sed script must be specified"
+msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
+
+#: src/msgfilter.c:413
+#, c-format
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:417
+#, c-format
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:441
+#, 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:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
+#, c-format
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+msgstr ""
+
+#: src/msgfilter.c:454
+#, c-format
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+
+#: src/msgfilter.c:456
+#, c-format
+msgid ""
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
+"                                to be executed\n"
+msgstr ""
+
+#: src/msgfilter.c:459
+#, c-format
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+
+#: src/msgfilter.c:477 src/msggrep.c:600
+#, c-format
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+
+#: src/msgfilter.c:483 src/msggrep.c:606
+#, c-format
+msgid "      --indent                indented output style\n"
+msgstr ""
+
+#: src/msgfilter.c:485
+#, c-format
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+
+# src/msgunfmt.c:373
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+#: src/msgfmt.c:372
+#, c-format
+msgid "the argument to %s should be a single punctuation character"
+msgstr ""
+
+#: src/msgfmt.c:419
+#, c-format
+msgid "invalid endianness: %s"
+msgstr ""
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
+msgstr ""
+
+#: src/msgfmt.c:471
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr ""
+
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
+#, c-format
+msgid "%s requires a \"-l locale\" specification"
+msgstr ""
+
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr ""
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr ""
+
+# src/xgettext.c:378 src/xgettext.c:382
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s a %s se vz�jemn� vylu�uj�"
+
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
+#, c-format
+msgid "%s is only valid with %s or %s"
+msgstr ""
+
+#: src/msgfmt.c:632 src/msgfmt.c:638
+#, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr ""
+
+# src/message.c:1115
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
 
 # src/msgfmt.c:343
-#: src/msgfmt.c:360
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -442,7 +2069,7 @@ msgstr[1] "%d p�elo�en� zpr�vy"
 msgstr[2] "%d p�elo�en�ch zpr�v"
 
 # src/msgfmt.c:345
-#: src/msgfmt.c:365
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -451,7 +2078,7 @@ msgstr[1] ", %d ne�pln� p�eklady"
 msgstr[2] ", %d ne�pln�ch p�eklad�"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:370
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -459,227 +2086,895 @@ msgstr[0] ", %d nep�elo�en� zpr�va"
 msgstr[1] ", %d nep�elo�en� zpr�vy"
 msgstr[2] ", %d nep�elo�en�ch zpr�v"
 
-# src/msgfmt.c:366
-#: src/msgfmt.c:392
-#, c-format, no-wrap
+#: src/msgfmt.c:906
+#, c-format
+msgid "Usage: %s [OPTION] filename.po ...\n"
+msgstr ""
+
+#: src/msgfmt.c:910
+#, c-format
+msgid "Generate binary message catalog from textual translation description.\n"
+msgstr ""
+
+#: src/msgfmt.c:922
+#, c-format
+msgid "  filename.po ...             input files\n"
+msgstr ""
+
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
+#, c-format
+msgid "Operation mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+
+#: src/msgfmt.c:933
+#, c-format
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+
+#: src/msgfmt.c:935
+#, c-format
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:937
+#, c-format
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:939
+#, c-format
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+
+#: src/msgfmt.c:941
+#, c-format
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr ""
+
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
+#, c-format
+msgid "      --strict                enable strict Uniforum mode\n"
+msgstr ""
+
+#: src/msgfmt.c:954 src/xgettext.c:1056
+#, c-format
+msgid "If output file is -, output is written to standard output.\n"
+msgstr ""
+
+#: src/msgfmt.c:957
+#, c-format
+msgid "Output file location in Java mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
+#, c-format
+msgid "  -r, --resource=RESOURCE     resource name\n"
+msgstr ""
+
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+
+#: src/msgfmt.c:967
+#, c-format
+msgid ""
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
+"separated with an underscore.  The -d option is mandatory.  The class is\n"
+"written under the specified directory.\n"
+msgstr ""
+
+#: src/msgfmt.c:973
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:979 src/msgunfmt.c:473
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:981
+#, 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:985
+#, c-format
+msgid "Output file location in Tcl mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:989 src/msgunfmt.c:483
+#, c-format
+msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgstr ""
+
+#: src/msgfmt.c:991
+#, 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:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
+#, c-format
+msgid "Input file interpretation:\n"
+msgstr ""
+
+#: src/msgfmt.c:1038
+#, c-format
+msgid ""
+"  -c, --check                 perform all the checks implied by\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
+msgstr ""
+
+#: src/msgfmt.c:1041
+#, c-format
+msgid "      --check-format          check language dependent format strings\n"
+msgstr ""
+
+#: src/msgfmt.c:1043
+#, c-format
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+
+#: src/msgfmt.c:1045
+#, c-format
+msgid ""
+"      --check-domain          check for conflicts between domain directives\n"
+"                                and the --output-file option\n"
+msgstr ""
+
+#: src/msgfmt.c:1048
+#, c-format
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+
+#: src/msgfmt.c:1050
+#, c-format
+msgid ""
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
+"                                menu items\n"
+msgstr ""
+
+#: src/msgfmt.c:1053
+#, c-format
+msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
+msgstr ""
+
+#: src/msgfmt.c:1058
+#, c-format
 msgid ""
-"Usage: %s [OPTION] filename.po ...\n"
-"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"
-"  -c, --check                 perform language dependent checks on strings\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
-"  -h, --help                  display this help and exit\n"
-"      --no-hash               binary file will not include the hash table\n"
-"  -o, --output-file=FILE      specify output file name as FILE\n"
-"      --statistics            print statistics about translations\n"
-"      --strict                enable strict Uniforum mode\n"
-"  -v, --verbose               list input file anomalies\n"
-"  -V, --version               output version information and exit\n"
-"\n"
-"Giving the -v option more than once increases the verbosity level.\n"
-"\n"
-"If input file is -, standard input is read.  If output file is -,\n"
-"output is written to standard output.\n"
 msgstr ""
-"Pou�it�: %s [P�EP�NA�] soubor.po ...\n"
-"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro odpov�daj�c�\n"
-"kr�tk� formy.\n"
-"\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"
-"  -f, --use-fuzzy          ve v�stupu pou�ije i ne�pln� p�eklady\n"
-"  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
-"      --no-hash            bin�rn� soubor nebude obsahovat ha�ovac� tabulku\n"
-"  -o, --output-file=SOUBOR zap��e v�stup do souboru SOUBOR\n"
-"      --statistics         vyp��e statistiky o p�ekladech\n"
-"      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
-"  -v, --verbose            vyp��e seznam neobvyklost� ve vstupn�m souboru\n"
-"  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
-"\n"
-"  Zad�n�m p�ep�na�e -v v�ce ne� jednou, zv���te podrobnost v�pis�.\n"
-"\n"
-"  Bude-li vstupn� soubor -, bude �ten standardn� vstup. Jestli�e v�stupn�\n"
-"soubor bude -, v�stup bude vypisov�n do standardn�ho v�stupu.\n"
 
-# src/msgfmt.c:407
-#: src/msgfmt.c:435
-msgid "while creating hash table"
-msgstr "p�i tvorb� ha�ovac� tabulky"
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
 
-#: src/msgfmt.c:479
+#: src/msgfmt.c:1063
 #, c-format
 msgid ""
-"%s: warning: PO file header missing, fuzzy, or invalid\n"
-"%*s  warning: charset conversion will not work"
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+
+#: src/msgfmt.c:1072
+#, c-format
+msgid "      --statistics            print statistics about translations\n"
+msgstr ""
+
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
+#, c-format
+msgid "  -v, --verbose               increase verbosity level\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:1185
+#, c-format
+msgid "warning: PO file header missing or invalid\n"
+msgstr ""
+
+#: src/msgfmt.c:1187
+#, fuzzy, c-format
+#| msgid ""
+#| "Charset missing in header.\n"
+#| "Message conversion to user's charset will not work.\n"
+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:471
-#: src/msgfmt.c:503
+#: src/msgfmt.c:1211
 #, 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:508
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "jm�no dom�ny \"%s\" nen� vhodn� jako jm�no souboru: bude pou�ito jako p�edpona"
+msgstr ""
+"jm�no dom�ny \"%s\" nen� vhodn� jako jm�no souboru: bude pou�ito jako "
+"p�edpona"
 
 # src/msgfmt.c:489
-#. We don't change the exit status here because this is really
-#. only an information.
-#: src/msgfmt.c:521
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "p��kaz `domain %s' ignorov�n"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:551
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "pr�zdn� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:552
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ne�pln� polo�ka `msgstr' ignorov�na"
 
-# src/msgfmt.c:561
-#: src/msgfmt.c:594
+# src/msgfmt.c:668
+#: src/msgfmt.c:1339
 #, c-format
-msgid "headerfield `%s' missing in header"
-msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
+msgid "%s: warning: source file contains fuzzy translation"
+msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
 
-# src/msgfmt.c:564
-#: src/msgfmt.c:597
+#: src/msgfmt.c:1455
 #, c-format
-msgid "header field `%s' should start at beginning of line"
-msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
+msgid "%s does not exist"
+msgstr ""
 
-# src/msgfmt.c:573
-#: src/msgfmt.c:607
-msgid "some header fields still have the initial default value"
-msgstr "n�kter� polo�ky hlavi�ky maj� st�le po��te�n� implicitn� hodnotu"
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
 
-# src/msgfmt.c:583
-#: src/msgfmt.c:618
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
-msgid "field `%s' still has initial default value"
-msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
+msgid "error while reading \"%s\""
+msgstr "chyba p�i �ten� \"%s\""
 
-# src/msgfmt.c:668
-#: src/msgfmt.c:708
+#: src/msggrep.c:501
 #, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+
+#: src/msggrep.c:521
+#, 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:547
+#, c-format, no-wrap
+msgid ""
+"Message selection:\n"
+"  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
+"  [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n"
+"  [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n"
+"A message is selected if it comes from one of the specified source files,\n"
+"or if it comes from one of the specified domains,\n"
+"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n"
+"or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
+"or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
+"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n"
+"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n"
+"\n"
+"When more than one selection criterion is specified, the set of selected\n"
+"messages is the union of the selected messages of each criterion.\n"
+"\n"
+"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
+"EXTRACTED-COMMENT-PATTERN syntax:\n"
+"  [-E | -F] [-e PATTERN | -f FILE]...\n"
+"PATTERNs are basic regular expressions by default, or extended regular\n"
+"expressions if -E is given, or fixed strings if -F is given.\n"
+"\n"
+"  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
+"  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+"  -J, --msgctxt               start of patterns for the msgctxt\n"
+"  -K, --msgid                 start of patterns for the msgid\n"
+"  -T, --msgstr                start of patterns for the msgstr\n"
+"  -C, --comment               start of patterns for the translator's comment\n"
+"  -X, --extracted-comment     start of patterns for the extracted comment\n"
+"  -E, --extended-regexp       PATTERN is an extended regular expression\n"
+"  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
+"  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
+"  -f, --file=FILE             obtain PATTERN from FILE\n"
+"  -i, --ignore-case           ignore case distinctions\n"
+"  -v, --invert-match          output only the messages that do not match any\n"
+"                              selection criterion\n"
+msgstr ""
+
+#: src/msggrep.c:602
+#, c-format
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+
+#: src/msggrep.c:623
+#, c-format
+msgid "      --sort-output           generate sorted output\n"
+msgstr ""
+
+#: src/msggrep.c:625
+#, c-format
+msgid "      --sort-by-file          sort output by file location\n"
+msgstr ""
+
+#: src/msginit.c:299
+#, c-format
+msgid ""
+"You are in a language indifferent environment.  Please set\n"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
+msgstr ""
+
+#: src/msginit.c:325
+#, c-format
+msgid ""
+"Output file %s already exists.\n"
+"Please specify the locale through the --locale option or\n"
+"the output .po file through the --output-file option.\n"
+msgstr ""
+
+#: src/msginit.c:351
+#, c-format
+msgid "Created %s.\n"
+msgstr ""
+
+#: src/msginit.c:371
+#, 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:381
+#, c-format
+msgid "  -i, --input=INPUTFILE       input POT file\n"
+msgstr ""
+
+#: src/msginit.c:383
+#, c-format
+msgid ""
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
+"If it is -, standard input is read.\n"
+msgstr ""
+
+#: src/msginit.c:389
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified PO file\n"
+msgstr ""
+
+#: src/msginit.c:391
+#, 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:404
+#, c-format
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
+msgstr ""
+
+#: src/msginit.c:406
+#, c-format
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+
+#: src/msginit.c:472
+msgid ""
+"Found more than one .pot file.\n"
+"Please specify the input .pot file through the --input option.\n"
+msgstr ""
+
+#: src/msginit.c:480 src/msginit.c:485
+#, c-format
+msgid "error reading current directory"
+msgstr ""
+
+#: src/msginit.c:493
+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:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
+#, c-format
+msgid "%s subprocess failed with exit code %d"
+msgstr ""
+
+#: src/msginit.c:1117
+msgid ""
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
+"you in case of unexpected technical problems.\n"
+msgstr ""
+
+#. TRANSLATORS: "English" needs to be replaced by your language.
+#. For example in it.po write "Traduzioni italiani ...",
+#. *not* "Traduzioni inglesi ...".
+#: src/msginit.c:1621
+#, c-format
+msgid "English translations for %s package"
+msgstr ""
+
+#: src/msgl-cat.c:178 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:188 src/msgl-iconv.c:258
+#, c-format
+msgid "two different charsets \"%s\" and \"%s\" in input file"
+msgstr ""
+
+#: 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: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:392 src/msgl-iconv.c:366
+#, c-format
+msgid "target charset \"%s\" is not a portable encoding name."
+msgstr ""
+
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
+#, fuzzy, c-format
+#| msgid "%s: warning: "
+msgid "warning: "
+msgstr "%s: upozorn�n�: "
+
+#: src/msgl-cat.c:444
+#, 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:450
+#, c-format
+msgid ""
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
+"Converting the output to UTF-8.\n"
+"To select a different output encoding, use the --to-code option.\n"
+msgstr ""
+
+#: src/msgl-cat.c:489
+#, c-format
+msgid ""
+"Conversion of file %s from %s encoding to %s encoding\n"
+"changes some msgids or msgctxts.\n"
+"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
+"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
+msgstr ""
+
+#: src/msgl-charset.c:92
+#, c-format
+msgid ""
+"Locale charset \"%s\" is different from\n"
+"input file charset \"%s\".\n"
+"Output of '%s' might be incorrect.\n"
+"Possible workarounds are:\n"
+msgstr ""
+
+#: src/msgl-charset.c:99
+#, c-format
+msgid "- Set LC_ALL to a locale with encoding %s.\n"
+msgstr ""
+
+#: src/msgl-charset.c:104
+#, c-format
+msgid ""
+"- Convert the translation catalog to %s using 'msgconv',\n"
+"  then apply '%s',\n"
+"  then convert back to %s using 'msgconv'.\n"
+msgstr ""
+
+#: src/msgl-charset.c:113
+#, c-format
+msgid ""
+"- Set LC_ALL to a locale with encoding %s,\n"
+"  convert the translation catalog to %s using 'msgconv',\n"
+"  then apply '%s',\n"
+"  then convert back to %s using 'msgconv'.\n"
+msgstr ""
+
+#: src/msgl-charset.c:127
+#, c-format
+msgid ""
+"Locale charset \"%s\" is not a portable encoding name.\n"
+"Output of '%s' might be incorrect.\n"
+"A possible workaround is to set LC_ALL=C.\n"
+msgstr ""
+
+#: src/msgl-check.c:134
+msgid "plural expression can produce negative values"
+msgstr ""
+
+#: src/msgl-check.c:145
+#, c-format
+msgid "nplurals = %lu but plural expression can produce values as large as %lu"
+msgstr ""
+
+#: src/msgl-check.c:191
+msgid "plural expression can produce division by zero"
+msgstr ""
+
+#: src/msgl-check.c:196
+msgid "plural expression can produce integer overflow"
+msgstr ""
+
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+
+#: src/msgl-check.c:270
+#, c-format
+msgid "Try using the following, valid for %s:"
+msgstr ""
+
+#: src/msgl-check.c:362 src/msgl-check.c:386
+msgid "message catalog has plural form translations"
+msgstr ""
+
+#: src/msgl-check.c:364
+msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgstr ""
+
+#: src/msgl-check.c:388
+msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgstr ""
+
+# src/po-lex.c:332
+#: src/msgl-check.c:424
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid nplurals value"
+msgstr "neplatn� ��d�c� sekvence"
+
+#: src/msgl-check.c:446
+msgid "invalid plural expression"
+msgstr ""
+
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, c-format
+msgid "nplurals = %lu"
+msgstr ""
+
+#: src/msgl-check.c:478
+#, 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] ""
+msgstr[2] ""
+
+#: src/msgl-check.c:494
+#, c-format
+msgid "but some messages have one plural form"
+msgid_plural "but some messages have %lu plural forms"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/msgl-check.c:518
+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/msgfmt.c:930
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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/msgfmt.c:938
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+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/msgfmt.c:948
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+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/msgfmt.c:963
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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/msgfmt.c:971
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+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/msgfmt.c:981
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr' nekon�� '\\n'"
 
-# src/msgfmt.c:892
-#: src/msgfmt.c:997
-msgid "number of format specifications in `msgid' and `msgstr' does not match"
-msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
+#: src/msgl-check.c:692
+msgid "plural handling is a GNU gettext extension"
+msgstr ""
 
-# src/msgfmt.c:909
-#: src/msgfmt.c:1014
+#: src/msgl-check.c:733
 #, c-format
-msgid "format specifications for argument %lu are not the same"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr ""
 
-# src/msgmerge.c:303
-#: src/msgmerge.c:320
-#, c-format, no-wrap
+#: src/msgl-check.c:744
+#, c-format
+msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgstr ""
+
+# src/msgfmt.c:573
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "some header fields still have the initial default value"
+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/msgfmt.c:561
+#: src/msgl-check.c:835
+#, fuzzy, c-format
+#| msgid "headerfield `%s' missing in header"
+msgid "header field '%s' missing in header\n"
+msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
+
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: 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:69
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+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:288
+msgid "input file doesn't contain a header entry with a charset specification"
+msgstr ""
+
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
+#, fuzzy, c-format
+#| msgid ""
+#| "Charset \"%s\" is not supported. %s relies on iconv(),\n"
+#| "and iconv() does not support \"%s\".\n"
 msgid ""
-"Usage: %s [OPTION] def.po ref.po\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -C, --compendium=FILE       additional library of message translations,\n"
-"                              may be specified more than once\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -h, --help                  display this help and exit\n"
-"  -i, --indent                indented output style\n"
-"  -o, --output-file=FILE      result will be written to FILE\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -v, --verbose               increase verbosity level\n"
-"  -V, --version               output version information and exit\n"
-"  -w, --width=NUMBER          set output page width\n"
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
+"a iconv() \"%s\" nepodporuje.\n"
+
+#: src/msgl-iconv.c:330
+#, c-format
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
+#, fuzzy, c-format
+#| msgid ""
+#| "Charset \"%s\" is not supported. %s relies on iconv().\n"
+#| "This version was built without iconv().\n"
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
+"Tato verze byla kompilov�na bez iconv().\n"
+
+#: src/msgmerge.c:426 src/msgmerge.c:432
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:508
+msgid "backup type"
 msgstr ""
-"Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
-"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
-"formy.\n"
-"\n"
-"  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t zad�na\n"
-"                           v�ce ne� jednou.\n"
-"  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
-"                           vstupn�ch soubor�\n"
-"  -e, --no-escape          zak�e C escape sekvence ve v�stupu (implicitn�)\n"
-"  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
-"                           roz���en�ch znak�\n"
-"      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
-"  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
-"  -i, --indent             odsazen� v�stupn� styl\n"
-"  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
-"      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
-"      --add-location       za�ad� ��dky '#: jm�no_souboru:��dka' (implicitn�)\n"
-"      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
-"  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
-"  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
-"  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
 # src/msgmerge.c:321
-#: src/msgmerge.c:340
-#, no-wrap
+#: src/msgmerge.c:545
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "\n"
+#| "Merges two Uniforum style .po files together.  The def.po file is an\n"
+#| "existing PO file with the old translations which will be taken over to\n"
+#| "the newly created file as long as they still match; comments will be\n"
+#| "preserved, but extract comments and file positions will be discarded.\n"
+#| "The ref.po file is the last created PO file (generally by xgettext), any\n"
+#| "translations or comments in the file will be discarded, however dot\n"
+#| "comments and file positions will be preserved.  Where an exact match\n"
+#| "cannot be found, fuzzy matching is used to produce better results.  The\n"
+#| "results are written to stdout unless an output file is specified.\n"
 msgid ""
-"\n"
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
-"existing PO file with the old translations which will be taken over to\n"
-"the newly created file as long as they still match; comments will be\n"
-"preserved, but extract comments and file positions will be discarded.\n"
-"The ref.po file is the last created PO file (generally by xgettext), any\n"
-"translations or comments in the file will be discarded, however dot\n"
+"existing PO file with translations which will be taken over to the newly\n"
+"created file as long as they still match; comments will be preserved,\n"
+"but extracted comments and file positions will be discarded.  The ref.pot\n"
+"file is the last created PO file with up-to-date source references but\n"
+"old translations, or a PO Template file (generally created by xgettext);\n"
+"any translations or comments in the file will be discarded, however dot\n"
 "comments and file positions will be preserved.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better results.  The\n"
-"results are written to stdout unless an output file is specified.\n"
+"cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 "\n"
 "  Slije dva .po soubory stylu Uniforum dohromady. Soubor def.po je existuj�c�\n"
@@ -693,442 +2988,1999 @@ 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:562
+#, c-format
+msgid "  def.po                      translations referring to old sources\n"
+msgstr ""
+
+#: src/msgmerge.c:564
+#, c-format
+msgid "  ref.pot                     references to new sources\n"
+msgstr ""
+
+#: src/msgmerge.c:568
+#, c-format
+msgid ""
+"  -C, --compendium=FILE       additional library of message translations,\n"
+"                              may be specified more than once\n"
+msgstr ""
+
+#: src/msgmerge.c:574
+#, c-format
+msgid ""
+"  -U, --update                update def.po,\n"
+"                              do nothing if def.po already up to date\n"
+msgstr ""
+
+#: src/msgmerge.c:586
+#, c-format
+msgid "Output file location in update mode:\n"
+msgstr ""
+
+#: src/msgmerge.c:588
+#, c-format
+msgid "The result is written back to def.po.\n"
+msgstr ""
+
+#: src/msgmerge.c:590
+#, c-format
+msgid "      --backup=CONTROL        make a backup of def.po\n"
+msgstr ""
+
+#: src/msgmerge.c:592
+#, c-format
+msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
+msgstr ""
+
+#: src/msgmerge.c:594
+#, c-format
+msgid ""
+"The version control method may be selected via the --backup option or "
+"through\n"
+"the VERSION_CONTROL environment variable.  Here are the values:\n"
+"  none, off       never make backups (even if --backup is given)\n"
+"  numbered, t     make numbered backups\n"
+"  existing, nil   numbered if numbered backups exist, simple otherwise\n"
+"  simple, never   always make simple backups\n"
+msgstr ""
+
+#: src/msgmerge.c:601
+#, c-format
+msgid ""
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
+"environment variable.\n"
+msgstr ""
+
+#: src/msgmerge.c:610
+#, c-format
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+
+#: src/msgmerge.c:615
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+
+#: src/msgmerge.c:672 src/urlget.c:191
+#, c-format
+msgid "  -q, --quiet, --silent       suppress progress indicators\n"
+msgstr ""
+
+# src/msgcmp.c:267 src/msgmerge.c:740
+#: src/msgmerge.c:1685
+#, fuzzy, c-format
+#| msgid "this message is used but not defined in %s"
+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:1706
+#, fuzzy, c-format
+#| msgid "this message is used but not defined in %s"
+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:799
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 "%sP�e�teno %ld p�vodn�ch + %ld referen�n�ch, slito %ld, podobn�ch %ld,\n"
 "chyb� %ld, zastaral�ch %ld.\n"
 
 # src/msgmerge.c:775
-#: src/msgmerge.c:806
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " dokon�eno.\n"
 
-# src/msgunfmt.c:215
-#: src/msgunfmt.c:210
-#, c-format, no-wrap
+# src/xgettext.c:378 src/xgettext.c:382
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and explicit file names are mutually exclusive"
+msgstr "%s a %s se vz�jemn� vylu�uj�"
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid "Usage: %s [OPTION] [FILE]...\n"
+msgstr ""
+
+#: src/msgunfmt.c:431
+#, c-format
+msgid "Convert binary message catalog to Uniforum style .po file.\n"
+msgstr ""
+
+#: src/msgunfmt.c:440
+#, c-format
 msgid ""
-"Usage: %s [OPTION] [FILE]...\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -e, --no-escape          do not use C escapes in output (default)\n"
-"  -E, --escape             use C escapes in output, no extended chars\n"
-"      --force-po           write PO file even if empty\n"
-"  -h, --help               display this help and exit\n"
-"  -i, --indent             write indented output style\n"
-"  -o, --output-file=FILE   write output into FILE instead of standard output\n"
-"      --strict             write strict uniforum style\n"
-"  -V, --version            output version information and exit\n"
-"  -w, --width=NUMBER       set output page width\n"
-msgstr ""
-"Pou�it�: %s [P�EP�NA�] [SOUBOR]...\n"
-"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
-"formy.\n"
-"\n"
-"  -e, --no-escape          nepou��v� C escape sekvence ve v�stupu (implicitn�)\n"
-"  -E, --escape             pou��v� C escape sekvence ve v�stupu, bez\n"
-"                           roz���en�ch znak�\n"
-"      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
-"  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
-"  -i, --indent             odsazen� v�stupn� styl\n"
-"  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
-"      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
-"  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
-"  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
 
-# src/msgunfmt.c:229
-#: src/msgunfmt.c:224
-#, no-wrap
+#: src/msgunfmt.c:442
+#, c-format
+msgid "      --csharp                C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:444
+#, c-format
 msgid ""
-"\n"
-"Convert binary .mo files to Uniforum style .po files.\n"
-"Both little-endian and big-endian .mo files are handled.\n"
-"If no input file is given or it is -, standard input is read.\n"
-"By default the output is written to standard output.\n"
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
-"\n"
-"  P�ev�d� bin�rn� .mo soubory do .po soubor� stylu Uniforum. Oba typy .mo\n"
-"soubor� little-endian a big-endian jsou akceptov�ny.\n"
-"  Nebude-li vstupn� soubor zad�n, nebo bude-li -, bude �ten standardn� vstup.\n"
-"Implicitn� je v�stup zapisov�n do standardn�ho v�stupu.\n"
 
-# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:216 src/xget-lex.c:243
+#: src/msgunfmt.c:446
 #, c-format
-msgid "error while reading \"%s\""
-msgstr "chyba p�i �ten� \"%s\""
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
 
-# src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/msgunfmt.c:262 src/msgunfmt.c:327
+#: src/msgunfmt.c:451
 #, c-format
-msgid "file \"%s\" truncated"
-msgstr "soubor \"%s\" je useknut�"
+msgid "  FILE ...                    input .mo files\n"
+msgstr ""
 
-# src/msgunfmt.c:298
-#: src/msgunfmt.c:293
+#: src/msgunfmt.c:456
 #, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "posun v souboru \"%s\" na pozici %ld selhal"
+msgid "Input file location in Java mode:\n"
+msgstr ""
 
-# src/msgunfmt.c:373
-#: src/msgunfmt.c:332
+#: src/msgunfmt.c:462
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+msgid ""
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
+"separated with an underscore.  The class is located using the CLASSPATH.\n"
+msgstr ""
 
-# src/msgunfmt.c:373
-#: src/msgunfmt.c:377
+#: src/msgunfmt.c:467
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
-msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
+msgid "Input file location in C# mode:\n"
+msgstr ""
 
-# src/gettextp.c:233
-#: src/ngettext.c:209
-#, c-format, no-wrap
+#: src/msgunfmt.c:475
+#, c-format
 msgid ""
-"Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-"  COUNT                     choose singular/plural form based on this value\n"
-msgstr ""
-"Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID MSGID-PLURAL PO�ET\n"
-"  -d, --domain=TEXTOV�DOM�NA p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
-"  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
-"  -E                         (ignorov�n - kv�li kompatibilit�)\n"
-"  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
-"  -n                         potla�� nov� ��dky na konci zpr�vy\n"
-"  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
-"  [TEXTOV�DOM�NA]            p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
-"  MSGID MSGID-PLURAL         vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
-"                             MSGID / MSGID-PLURAL\n"
-"  PO�ET                      na z�klad� t�to hodnoty vybere odpov�daj�c�\n"
-"                             p�eklad\n"
+"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/gettextp.c:245
-#: src/ngettext.c:221
+#: src/msgunfmt.c:479
+#, c-format
+msgid "Input file location in Tcl mode:\n"
+msgstr ""
+
+#: 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:511
+#, c-format
+msgid "  -i, --indent                write indented output style\n"
+msgstr ""
+
+#: src/msgunfmt.c:513
+#, c-format
+msgid "      --strict                write strict uniforum style\n"
+msgstr ""
+
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
-"\n"
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"Standard search directory: %s\n"
+"Unifies duplicate translations in a translation catalog.\n"
+"Finds duplicate translations of the same message ID.  Such duplicates are\n"
+"invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
+"default, duplicates are merged together.  When using the --repeated option,\n"
+"only duplicates are output, and all other messages are discarded.  Comments\n"
+"and extracted comments will be cumulated, except that if --use-first is\n"
+"specified, they will be taken from the first translation.  File positions\n"
+"will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"\n"
-"  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
-"prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
-"v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
-"v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
-"  Adres��, ve kter�m se hled�: %s\n"
 
-#: src/open-po.c:64
+#: src/msguniq.c:364
+#, c-format
+msgid "  -d, --repeated              print only duplicates\n"
+msgstr ""
+
+#: src/msguniq.c:366
+#, c-format
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+
+#: 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>"
 
-#: po-gram-gen.y:87
+#: src/po-charset.c:489
+#, c-format
+msgid ""
+"Charset \"%s\" is not a portable encoding name.\n"
+"Message conversion to user's charset might not work.\n"
+msgstr ""
+"Ozna�en� znakov� sady \"%s\" nen� portabiln� n�zev k�dov�n�. \n"
+"P�evod znak� do u�ivatelsk� znakov� sady nebude fungovat.\n"
+
+#: src/po-charset.c:557
+#, c-format
+msgid ""
+"Charset \"%s\" is not supported. %s relies on iconv(),\n"
+"and iconv() does not support \"%s\".\n"
+msgstr ""
+"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
+"a iconv() \"%s\" nepodporuje.\n"
+
+#: src/po-charset.c:564 src/po-charset.c:612
+msgid ""
+"Installing GNU libiconv and then reinstalling GNU gettext\n"
+"would fix this problem.\n"
+msgstr ""
+"Instalace GNU libiconv a n�sledn� reinstalace GNU gettextu\n"
+"m��e napravit tento probl�m.\n"
+
+#: src/po-charset.c:578 src/po-charset.c:616
+msgid "Continuing anyway, expect parse errors."
+msgstr "Pokra�uji, p�edpokl�d�na chyba parsingu."
+
+#: src/po-charset.c:580
+msgid "Continuing anyway."
+msgstr "Pokra�uji."
+
+#: src/po-charset.c:607
+#, c-format
+msgid ""
+"Charset \"%s\" is not supported. %s relies on iconv().\n"
+"This version was built without iconv().\n"
+msgstr ""
+"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
+"Tato verze byla kompilov�na bez iconv().\n"
+
+#: src/po-charset.c:644
+msgid ""
+"Charset missing in header.\n"
+"Message conversion to user's charset 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/po-gram-gen.y:94
+#, c-format
 msgid "inconsistent use of #~"
 msgstr "nekonzistentn� pou�it� #~"
 
 # ../../src/po-gram.y:83
-#: po-gram-gen.y:168
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "chyb� sekce `msgstr[]'"
 
 # ../../src/po-gram.y:83
-#: po-gram-gen.y:176
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "chyb� sekce `msgid_plural'"
 
 # ../../src/po-gram.y:83
-#: po-gram-gen.y:183
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "chyb� sekce `msgstr'"
 
-#: po-gram-gen.y:228
+#: src/po-gram-gen.y:397
+#, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvn� mno�n� ��slo m� nenulov� index"
 
-#: po-gram-gen.y:230
+#: src/po-gram-gen.y:399
+#, c-format
 msgid "plural form has wrong index"
 msgstr "mno�n� ��slo m� chybn� index"
 
 # src/po-lex.c:129 src/po-lex.c:168
-#. CAUTION: If you change this macro, you must also make identical
-#. changes to the function of the same name in src/po-lex.c
-#: src/po-lex.c:159 src/po-lex.c:198 src/po-lex.h:85 src/po-lex.h:99
-#: src/po-lex.h:115 src/po-lex.h:129
+#: 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:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
+#, c-format
+msgid "invalid multibyte sequence"
+msgstr "neplatn� v�ceznakov� sekvence"
+
+#: src/po-lex.c:465
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence at end of file"
+msgstr "neplatn� v�ceznakov� sekvence"
+
+#: src/po-lex.c:474
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence at end of line"
+msgstr "neplatn� v�ceznakov� sekvence"
+
+#: src/po-lex.c:485
+msgid "iconv failure"
+msgstr ""
+
 # src/po-lex.c:241
-#: src/po-lex.c:274
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kl��ov� slovo \"%s\" nen� zn�mo"
 
 # src/po-lex.c:332
-#: src/po-lex.c:377
+#: src/po-lex.c:852
+#, c-format
 msgid "invalid control sequence"
 msgstr "neplatn� ��d�c� sekvence"
 
 # src/po-lex.c:420
-#: src/po-lex.c:480
+#: src/po-lex.c:979
+#, c-format
 msgid "end-of-file within string"
 msgstr "konec souboru uprost�ed �et�zce"
 
 # src/po-lex.c:415
-#: src/po-lex.c:485
+#: src/po-lex.c:985
+#, c-format
 msgid "end-of-line within string"
 msgstr "konec ��dku uprost�ed �et�zce"
 
-#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
-msgid "invalid multibyte sequence"
-msgstr "neplatn� v�ceznakov� sekvence"
+#: src/po-lex.c:1006
+#, c-format
+msgid "context separator <EOT> within string"
+msgstr ""
 
-#: src/po.c:302 src/po.c:374 src/po.c:409 src/po.c:439
+# src/xgettext.c:658 src/xgettext.c:968
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
-msgid "%s: warning: "
-msgstr "%s: upozorn�n�: "
+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:370
+msgid "duplicate message definition"
+msgstr "dvojn�sobn� definice zpr�vy"
 
-#: src/po.c:303
+# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
+#: src/read-catalog.c:372
+#, fuzzy
+#| msgid "...this is the location of the first definition"
+msgid "this is the location of the first definition"
+msgstr "...toto je um�st�n� prvn� definice"
+
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
 #, c-format
-msgid ""
-"Charset \"%s\" is not a portable encoding name.\n"
-"Message conversion to user's charset might not work.\n"
+msgid "missing '=' after \"%s\""
 msgstr ""
-"Ozna�en� znakov� sady \"%s\" nen� portabiln� n�zev k�dov�n�. \n"
-"P�evod znak� do u�ivatelsk� znakov� sady nebude fungovat.\n"
 
-#: src/po.c:370 src/po.c:405
-msgid "Continuing anyway, expect parse errors."
-msgstr "Pokra�uji, p�edpokl�d�na chyba parsingu."
+# src/po-lex.c:332
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid non-blank line"
+msgstr "neplatn� ��d�c� sekvence"
 
-#: src/po.c:372
-msgid "Continuing anyway."
-msgstr "Pokra�uji."
+# src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
+#, fuzzy, c-format
+#| msgid "file \"%s\" truncated"
+msgid "file \"%s\" is truncated"
+msgstr "soubor \"%s\" je useknut�"
+
+# src/msgunfmt.c:373
+#: src/read-mo.c:132
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+# src/msgunfmt.c:373
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+# src/msgunfmt.c:373
+#: src/read-mo.c:183 src/read-mo.c:291
+#, c-format
+msgid "file \"%s\" is not in GNU .mo format"
+msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
 
-#: src/po.c:375
+# src/msgunfmt.c:373
+#: src/read-mo.c:197
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated string, at %s"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
+#: src/read-properties.c:357
+msgid "warning: invalid \\uxxxx syntax for Unicode character"
+msgstr ""
+
+#: src/read-properties.c:429
 #, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr ""
+
+# src/xget-lex.c:914
+#: src/read-stringtable.c:802
+#, fuzzy
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "warning: unterminated string"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+#: src/read-stringtable.c:810
+msgid "warning: syntax error"
+msgstr ""
+
+# src/xget-lex.c:914
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "warning: unterminated key/value pair"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+#: src/read-stringtable.c:940
+msgid "warning: syntax error, expected ';' after string"
+msgstr ""
+
+#: src/read-stringtable.c:948
+msgid "warning: syntax error, expected '=' or ';' after string"
+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/recode-sr-latin.c:115
+#, fuzzy, c-format
+#| msgid "Written by %s.\n"
+msgid "Written by %s and %s.\n"
+msgstr "Autor: %s\n"
+
+#. TRANSLATORS: This is a proper name. The last name is
+#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
+#. "&Scaron;egan".
+#. This is a proper name. See the gettext manual, section Names.
+#: src/recode-sr-latin.c:119
+msgid "Danilo Segan"
+msgstr ""
+
+#: src/recode-sr-latin.c:152
+#, c-format, no-wrap
+msgid "Recode Serbian text from Cyrillic to Latin script.\n"
+msgstr ""
+
+#: src/recode-sr-latin.c:155
+#, c-format, no-wrap
 msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv(),\n"
-"and iconv() does not support \"%s\".\n"
+"The input text is read from standard input.  The converted text is output to\n"
+"standard output.\n"
 msgstr ""
-"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv()\n"
-"a iconv() \"%s\" nepodporuje.\n"
 
-#: src/po.c:385 src/po.c:418
+#: src/recode-sr-latin.c:335
+#, c-format
+msgid "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/recode-sr-latin.c:363
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+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:158
+#, fuzzy, c-format
+#| msgid "too many arguments"
+msgid "expected two arguments"
+msgstr "p��li� mnoho argument�"
+
+#: src/urlget.c:175
+#, c-format
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:180
+#, c-format, no-wrap
 msgid ""
-"Installing GNU libiconv and then reinstalling GNU gettext\n"
-"would fix this problem.\n"
+"Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
 msgstr ""
-"Instalace GNU libiconv a n�sledn� reinstalace GNU gettextu\n"
-"m��e napravit tento probl�m.\n"
 
-#: src/po.c:393 src/po.c:425
+# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/urlget.c:227
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error reading \"%s\""
+msgstr "chyba p�i �ten� \"%s\""
+
+# src/message.c:1182
+#: src/urlget.c:233
+#, fuzzy, c-format
+#| msgid "error while writing \"%s\" file"
+msgid "error writing stdout"
+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
+#: src/urlget.c:237
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error after reading \"%s\""
+msgstr "chyba p�i �ten� \"%s\""
+
+#: src/urlget.c:263
 #, c-format
-msgid "%s\n"
-msgstr "%s\n"
+msgid "Retrieving %s..."
+msgstr ""
 
-#: src/po.c:410
+#: src/urlget.c:296
 #, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
+#: src/write-catalog.c:125
 msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv().\n"
-"This version was built without iconv().\n"
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr ""
-"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
-"Tato verze byla kompilov�na bez iconv().\n"
 
-#: src/po.c:440
+#: src/write-catalog.c:128
 msgid ""
-"Charset missing in header.\n"
-"Message conversion to user's charset will not work.\n"
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr ""
-"V hlavi�ce chyb� definice znakov� sady.\n"
-"Konverze zpr�v do u�ivatelovy znakov� sady nen� mo�n�.\n"
 
-# src/message.c:784
-#: src/write-po.c:322
-#, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "zpr�vy katalogu nesm� obsahovat escape sekvenci `\\%c'"
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
 
 # src/message.c:1115
-#: src/write-po.c:863
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 # src/message.c:1122
-#: src/write-po.c:870
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standardn� v�stup"
 
-# src/message.c:1182
-#: src/write-po.c:945
+#: src/write-csharp.c:708
 #, c-format
-msgid "error while writing \"%s\" file"
+msgid "failed to create directory \"%s\""
+msgstr ""
+
+#: src/write-csharp.c:771
+#, c-format
+msgid "compilation of C# class failed, please try --verbose"
+msgstr ""
+
+#: src/write-csharp.c:773
+#, c-format
+msgid "compilation of C# class failed"
+msgstr ""
+
+# src/msgfmt.c:321
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
+
+#: src/write-java.c:1096
+#, c-format
+msgid "not a valid Java class name: %s"
+msgstr ""
+
+#: src/write-java.c:1216
+#, c-format
+msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgstr ""
+
+#: src/write-java.c:1219
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "neplatn� v�ceznakov� sekvence"
+
+# src/message.c:784
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr "zpr�vy katalogu nesm� obsahovat escape sekvenci `\\%c'"
+
+#: src/write-po.c:1334 src/write-po.c:1502
+#, c-format
+msgid ""
+"The following msgctxt contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgctxt instead.\n"
+"%s\n"
+msgstr ""
+
+#: src/write-po.c:1346 src/write-po.c:1514
+#, c-format
+msgid ""
+"The following msgid contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgid instead.\n"
+"%s\n"
+msgstr ""
+
+#: src/write-qt.c:668
+msgid ""
+"message catalog has plural form translations\n"
+"but the Qt message catalog format doesn't support plural handling\n"
+msgstr ""
+
+#: src/write-qt.c:694
+msgid ""
+"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 ""
+
+#: src/write-qt.c:718
+msgid ""
+"message catalog has msgid 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 untranslated strings\n"
+msgstr ""
+
+# src/message.c:1182
+#: src/write-resources.c:96
+#, fuzzy, c-format
+#| msgid "error while writing \"%s\" file"
+msgid "error while writing to %s subprocess"
 msgstr "chyba p�i z�pisu do souboru \"%s\""
 
-# src/xget-lex.c:150
-#: src/xget-lex.c:148
-msgid "standard input"
-msgstr "standardn� vstup"
+#: src/write-resources.c:133
+msgid ""
+"message catalog has context dependent translations\n"
+"but the C# .resources format doesn't support contexts\n"
+msgstr ""
+
+#: src/write-resources.c:152
+msgid ""
+"message catalog has plural form translations\n"
+"but the C# .resources format doesn't support plural handling\n"
+msgstr ""
+
+#: src/write-tcl.c:159
+msgid ""
+"message catalog has context dependent translations\n"
+"but the Tcl message catalog format doesn't support contexts\n"
+msgstr ""
+
+#: src/write-tcl.c:178
+msgid ""
+"message catalog has plural form translations\n"
+"but the Tcl message catalog format doesn't support plural handling\n"
+msgstr ""
+
+# src/xget-lex.c:914
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+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:591
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated regular expression"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
 # src/xget-lex.c:892
-#: src/xget-lex.c:876
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated character constant"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
+
+# src/xget-lex.c:914
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+# src/xget-lex.c:914
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+# src/xget-lex.c:914
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+# src/xget-lex.c:892
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
-#: src/xget-lex.c:898
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
+#: src/x-csharp.c:225
+msgid "Please specify the source encoding through --from-code."
+msgstr ""
+
+#: 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: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: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: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:315 src/x-javascript.c:321 src/x-python.c:375
+#, c-format
+msgid "%s:%d: iconv failure"
+msgstr ""
+
+#: 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/xget-lex.c:892
+#: src/x-csharp.c:1451 src/x-java.c:668
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated character constant"
+msgid "%s:%d: warning: unterminated string constant"
+msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
+
+#: src/x-csharp.c:1953 src/x-java.c:1153
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr ""
+
+#: src/x-csharp.c:1983 src/x-java.c:1183
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr ""
+
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+
+# src/xgettext.c:1342
+#: src/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "jazyk `%s' nen� zn�m"
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr ""
+
 # src/xgettext.c:386
-#: src/xgettext.c:373
+#: src/xgettext.c:701
+#, 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:378
+#: src/xgettext.c:705
+#, 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:484
+#: src/xgettext.c:839
 #, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
+
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+
+# src/xgettext.c:501
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:537
-#: src/xgettext.c:520
-#, c-format, no-wrap
+#: src/xgettext.c:1027
+#, c-format
+msgid "Extract translatable strings from given input files.\n"
+msgstr ""
+
+#: src/xgettext.c:1050
+#, c-format
 msgid ""
-"Usage: %s [OPTION] INPUTFILE ...\n"
-"Extract translatable string from given input files.\n"
-"\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -a, --extract-all              extract all strings\n"
-"  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-"                                 preceding keyword lines) in output file\n"
-"  -C, --c++                      shorthand for --language=C++\n"
-"      --debug                    more detailed formatstring recognision result\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"      --force-po                 write PO file even if empty\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -F, --sort-by-file             sort output by file location\n"
-msgstr ""
-"Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
-"  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
-"formy.\n"
-"\n"
-"  -a, --extract-all             extrahuje v�echny �et�zce\n"
-"  -c, --add-comments[=JMENOVKA] um�st� blok koment��e se JMENOVKOU (nebo ty,\n"
-"                                kter� p�edch�zej� ��dku s kl��ov�m slovem)\n"
-"                                do v�stupn�ho souboru\n"
-"  -C, --c++                     zkratka pro --language=C++\n"
-"      --debug                   detailn�j�� informace o rozpozn�v�n�\n"
-"                                form�tovac�ch �et�zc�\n"
-"  -d, --default-domain=JM�NO    pou�ije JM�NO.po pro v�stup (m�sto messages.po)\n"
-"  -D, --directory=ADRES��       p�id� ADRES�� do seznamu adres���, ve kter�ch\n"
-"                                se hledaj� vstupn� soubory\n"
-"  -e, --no-escape               nepou��v� C escape sekvence ve v�stupu\n"
-"                                (implicitn�)\n"
-"  -E, --escape                  pou��v� C escape sekvence ve v�stupu, bez\n"
-"                                roz���en�ch znak�\n"
-"  -f, --files-from=SOUBOR       seznam vstupn�ch soubor� bude �ten ze SOUBORu\n"
-"      --force-po                zap��e .po soubor, i kdy� bude pr�zdn�\n"
-"      --foreign-user            vynech� copyright FSF ve v�stupu \n"
-"  -F, --sort-by-file            se�ad� v�stup podle um�st�n� zpr�v\n"
-"                                ve zdrojov�ch souborech\n"
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
 
-# src/xgettext.c:555
-#: src/xgettext.c:540
-#, no-wrap
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr ""
+
+#: src/xgettext.c:1054
+#, c-format
 msgid ""
-"  -h, --help                     display this help and exit\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"  -j, --join-existing            join messages with existing file\n"
-"  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
-"                                 WORD means not to use default keywords)\n"
-"  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-"                                 otherwise is guessed from file extension\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-msgstr ""
-"  -h, --help                    vyp��e tuto n�pov�du a ukon�� se\n"
-"  -i, --indent                  ve v�stupn�m .po souboru pou�ije odsazen� styl\n"
-"  -j, --join-existing           spoj� zpr�vy z existuj�c�ch soubor�\n"
-"  -k, --keyword[=SLOVO]         dodate�n� kl��ov� slovo, kter� bude hled�no\n"
-"                                (bez SLOVA, znamen� nepou�it� implicitn�ch\n"
-"                                kl��ov�ch slov)\n"
-"  -L, --language=N�ZEV          zad�n� jazyka (C, C++)           \n"
-"  -m, --msgstr-prefix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p�edponu pro\n"
-"                                polo�ky msgstr\n"
-"  -M, --msgstr-suffix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p��ponu pro\n"
-"                                polo�ky msgstr\n"
-"      --no-location             potla�� ��dky '#: jm�no_souboru:��dek'\n"
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
 
-# src/xgettext.c:569
-#: src/xgettext.c:552
-#, no-wrap
+# src/msgfmt.c:273 src/xgettext.c:410
+#: src/xgettext.c:1059
+#, fuzzy, c-format
+#| msgid "no input file given"
+msgid "Choice of input file language:\n"
+msgstr "vstupn� soubor nen� zad�n"
+
+#: src/xgettext.c:1061
+#, c-format
 msgid ""
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-"  -s, --sort-output              generate sorted output and remove duplicates\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"  -V, --version                  output version information and exit\n"
-"  -w, --width=NUMBER             set output page width\n"
-"  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
-"\n"
-"If INPUTFILE is -, standard input is read.\n"
-msgstr ""
-"  -n, --add-location            vytv��� ��dky '#: jm�no_souboru:��dek' (impl.)\n"
-"      --omit-header             nezapisuje hlavi�ku s `msgid \"\"' polo�kou\n"
-"  -o, --output=SOUBOR           zap��e v�stup do ur�en�ho souboru\n"
-"  -p, --output-dir=ADRES��      v�stupn� soubory budou um�st�ny do adres��e\n"
-"                                ADRES��\n"
-"  -s, --sort-output             generuje se�azen� v�stup bez duplicitn�ch zpr�v\n"
-"      --strict                  v�stupn� soubor bude stylu Uniforum\n"
-"  -T, --trigraphs               zapne podporu ANSI C `trigraphs' na vstupu\n"
-"  -V, --version                 vyp��e ozna�en� verze a ukon�� se\n"
-"  -w, --width=��SLO             nastav� v�stupn� ���ku str�nky\n"
-"  -x, --exclude-file=SOUBOR     soubory ze SOUBORu nebudou zpracov�ny \n"
-"\n"
-"  Bude-li VSTUPN�SOUBOR -, bude �ten standardn� vstup.\n"
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
 
-# src/xget-lex.c:914
-#: src/xgettext.c:914
+#: src/xgettext.c:1068
 #, c-format
-msgid "%s:%d: warning: keyword nested in keyword arg"
-msgstr "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:1070
 #, c-format
-msgid "%s:%d: warning: keyword between outer keyword and its arg"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
-"%s:%d: upozorn�n�: kl��ov� slovo mezi krajn�m kl��ov�m slovem\n"
-"a jeho argumentem"
 
-# src/xgettext.c:1342
-#: src/xgettext.c:1420
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr ""
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr ""
+
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr ""
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr ""
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr ""
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr ""
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr ""
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr ""
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr ""
+
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+
+#: src/xgettext.c:1190
 #, c-format
-msgid "language `%s' unknown"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+
+# src/xget-lex.c:150
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "standardn� vstup"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+# src/xgettext.c:1342
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
 msgstr "jazyk `%s' nen� zn�m"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:303
+#, 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-javascript.c:312
+#, 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-javascript.c:344
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+
+# src/xget-lex.c:914
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+# src/msgcmp.c:281
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "warning: this message is not used"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
+
+# src/xget-lex.c:914
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr ""
+
+#: src/x-perl.c:1074
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr ""
+
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr ""
+
+# lib/getopt.c:736
+#: src/x-perl.c:1249
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-python.c:279
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:325
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:342
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:355
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:365
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:398
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr ""
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr ""
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr ""
+
+#: src/x-rst.c:676
+#, c-format
+msgid "%s:%d: invalid JSON syntax"
+msgstr ""
+
+#: src/x-rst.c:683
+#, c-format
+msgid "%s:%d: invalid RSJ syntax"
+msgstr ""
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+# src/xget-lex.c:914
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr ""
+
+# src/po-lex.c:332
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "neplatn� ��d�c� sekvence"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr ""
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr ""
+
+# src/po-lex.c:332
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "neplatn� ��d�c� sekvence"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "neplatn� v�ceznakov� sekvence"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr ""
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr ""
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+# lib/getopt.c:652
+#, 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:703
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: nezn�m� p�ep�na� `--%s'\n"
+
+# lib/getopt.c:733
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+
+# lib/getopt.c:813
+#, 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
+#, 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"
+
+# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
+# src/msgunfmt.c:175 src/xgettext.c:394
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "  Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "  Toto je voln� programov� vybaven�; podm�nky pro kop�rov�n� a roz�i�ov�n�\n"
+#~ "naleznete ve zdrojov�ch textech. Toto programov� vybaven� je zcela BEZ Z�RUKY,\n"
+#~ "a to i bez z�ruky PRODEJNOSTI nebo VHODNOSTI PRO N�JAK� KONKR�TN� ��EL.\n"
+
+# src/gettextp.c:233
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID ] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTOV�DOM�NA nastav� textovou dom�nu, ze kter� je MSGID\n"
+#~ "  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
+#~ "  -E                         (ignorov�n - kv�li kompatibilit�)\n"
+#~ "  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -n                         potla�� nov� ��dky na konci zpr�vy\n"
+#~ "  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  [TEXTOV�DOM�NA] MSGID      vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
+#~ "                             MSGID z TEXTOV�DOM�NY\n"
+
+# src/gettextp.c:245
+#, c-format, no-wrap
+#~ msgid ""
+#~ "\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#~ "regular directory, another location can be specified with the environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
+#~ "prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
+#~ "v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
+#~ "v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
+#~ "  Je-li pou�it argument -s, program se chov� jako p��kaz `echo'. M�sto toto,\n"
+#~ "aby pouze kop�roval svoje argumenty do stdout, vyp��e p�eklad zpr�v ze\n"
+#~ "zvolen�ho katalogu. \n"
+#~ "\n"
+#~ "  Standardn� prohled�van� adres��: %s\n"
+
+# src/msgcmp.c:396 src/msgmerge.c:539
+#, c-format
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "tato zpr�va nem� ��dnou definici v dom�n� \"%s\""
+
+# src/xgettext.c:340 src/xgettext.c:1256
+#~ msgid "while preparing output"
+#~ msgstr "p�i p��prav� v�stupu"
+
+# src/xgettext.c:537
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -d, --default-domain=JM�NO  zap��e v�stup do JM�NO.po (m�sto do messages.po)\n"
+#~ "  -D, --directory=ADRES��     p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                              vstupn�ch soubor�\n"
+#~ "  -e, --no-escape             nepou��v� escape sekvence z C ve v�stupu\n"
+#~ "                              (implicitn�)\n"
+#~ "  -E, --escape                pou��v� C escape sekvence ve v�stupu, bez\n"
+#~ "                              roz���en�ch znak�\n"
+#~ "  -f, --files-from=SOUBOR     vezme seznam vstupn�ch soubor� ze SOUBORu\n"
+#~ "      --force-po              vyp��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -F, --sort-by-file          se�ad� v�stup podle um�st�n� zpr�v ve zdrojov�ch\n"
+#~ "                              souborech\n"
+#~ "  -h, --help                  vyp��e tuto n�pov�du a ukon�� se\n"
+
+# src/xgettext.c:569
+#~ msgid ""
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ "  -i, --indent                vyp��e .po soubor odsazovac�m stylem\n"
+#~ "      --no-location           nevytv��� ��dky '#: filename:line'\n"
+#~ "  -n, --add-location          vytv��� ��dky '#: jm�no_souboru:��dka' "
+#~ "��dky\n"
+#~ "                              (implicitn�)\n"
+#~ "      --omit-header           nevypisuje hlavi�ku s `msgid \"\"' "
+#~ "polo�kou\n"
+#~ "  -o, --output=SOUBOR         zap��e v�stup do ur�en�ho souboru\n"
+#~ "  -p, --output-dir=ADRES��    v�stupn� soubory budou um�st�ny do tohoto\n"
+#~ "                              adres��e\n"
+#~ "  -s, --sort-output           generuje se�azen� v�stup bez duplicitn�ch "
+#~ "zpr�v\n"
+#~ "      --strict                vytvo�� v�stupn� soubor ve stylu Uniforum\n"
+#~ "  -T, --trigraphs             rozum� ANSI C `trigraphs' na vstupu\n"
+#~ "  -u, --unique                zkratka pro --less-than=2, v�stupem budou "
+#~ "pouze\n"
+#~ "                              zpr�vy obsa�en� v katalog�ch pouze jednou\n"
+
+# src/msgfmt.c:366
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "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"
+#~ "  -c, --check                 perform language dependent checks on strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] soubor.po ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro odpov�daj�c�\n"
+#~ "kr�tk� formy.\n"
+#~ "\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"
+#~ "  -f, --use-fuzzy          ve v�stupu pou�ije i ne�pln� p�eklady\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "      --no-hash            bin�rn� soubor nebude obsahovat ha�ovac� tabulku\n"
+#~ "  -o, --output-file=SOUBOR zap��e v�stup do souboru SOUBOR\n"
+#~ "      --statistics         vyp��e statistiky o p�ekladech\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            vyp��e seznam neobvyklost� ve vstupn�m souboru\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "\n"
+#~ "  Zad�n�m p�ep�na�e -v v�ce ne� jednou, zv���te podrobnost v�pis�.\n"
+#~ "\n"
+#~ "  Bude-li vstupn� soubor -, bude �ten standardn� vstup. Jestli�e v�stupn�\n"
+#~ "soubor bude -, v�stup bude vypisov�n do standardn�ho v�stupu.\n"
+
+# src/msgfmt.c:407
+#~ msgid "while creating hash table"
+#~ msgstr "p�i tvorb� ha�ovac� tabulky"
+
+#, c-format
+#~ msgid ""
+#~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
+#~ "%*s  warning: charset conversion will not work"
+#~ 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:564
+#, c-format
+#~ msgid "header field `%s' should start at beginning of line"
+#~ msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
+
+# src/msgfmt.c:583
+#, c-format
+#~ msgid "field `%s' still has initial default value"
+#~ msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
+
+# src/msgmerge.c:303
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] def.po ref.po\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "                              may be specified more than once\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "  -o, --output-file=FILE      result will be written to FILE\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] def.po ref.po\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -C, --compendium=SOUBOR  p��davn� knihovna p�eklad� zpr�v. M��e b�t zad�na\n"
+#~ "                           v�ce ne� jednou.\n"
+#~ "  -D, --directory=ADRES��  p�id� ADRES�� do seznamu adres��� pro hled�n�\n"
+#~ "                           vstupn�ch soubor�\n"
+#~ "  -e, --no-escape          zak�e C escape sekvence ve v�stupu (implicitn�)\n"
+#~ "  -E, --escape             pou�ije C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --no-location        potla�� ��dky '#: jm�no_souboru:��dka'\n"
+#~ "      --add-location       za�ad� ��dky '#: jm�no_souboru:��dka' (implicitn�)\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -v, --verbose            zv��en� mno�stv� vypisovan�ch informac�\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgunfmt.c:215
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] [FILE]...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] [SOUBOR]...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -e, --no-escape          nepou��v� C escape sekvence ve v�stupu (implicitn�)\n"
+#~ "  -E, --escape             pou��v� C escape sekvence ve v�stupu, bez\n"
+#~ "                           roz���en�ch znak�\n"
+#~ "      --force-po           zap��e .po soubor, i kdy� je pr�zdn�\n"
+#~ "  -h, --help               vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent             odsazen� v�stupn� styl\n"
+#~ "  -o, --output-file=SOUBOR v�sledek bude zaps�n do SOUBORu\n"
+#~ "      --strict             zp�sob� p��sn� dodr�ov�n� stylu Uniforum\n"
+#~ "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
+
+# src/msgunfmt.c:229
+#, no-wrap
+#~ msgid ""
+#~ "\n"
+#~ "Convert binary .mo files to Uniforum style .po files.\n"
+#~ "Both little-endian and big-endian .mo files are handled.\n"
+#~ "If no input file is given or it is -, standard input is read.\n"
+#~ "By default the output is written to standard output.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  P�ev�d� bin�rn� .mo soubory do .po soubor� stylu Uniforum. Oba typy .mo\n"
+#~ "soubor� little-endian a big-endian jsou akceptov�ny.\n"
+#~ "  Nebude-li vstupn� soubor zad�n, nebo bude-li -, bude �ten standardn� vstup.\n"
+#~ "Implicitn� je v�stup zapisov�n do standardn�ho v�stupu.\n"
+
+# src/msgunfmt.c:298
+#, c-format
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
+
+# src/gettextp.c:233
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] [[[TEXTOV�DOM�NA] MSGID MSGID-PLURAL PO�ET\n"
+#~ "  -d, --domain=TEXTOV�DOM�NA p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
+#~ "  -e                         umo�n� expanzi n�kter�ch escape sekvenc�\n"
+#~ "  -E                         (ignorov�n - kv�li kompatibilit�)\n"
+#~ "  -h, --help                 vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -n                         potla�� nov� ��dky na konci zpr�vy\n"
+#~ "  -V, --version              vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  [TEXTOV�DOM�NA]            p�eklady z�sk�v� z TEXTOV�DOM�NY\n"
+#~ "  MSGID MSGID-PLURAL         vyp��e p�elo�enou zpr�vu odpov�daj�c�\n"
+#~ "                             MSGID / MSGID-PLURAL\n"
+#~ "  PO�ET                      na z�klad� t�to hodnoty vybere odpov�daj�c�\n"
+#~ "                             p�eklad\n"
+
+# src/gettextp.c:245
+#, c-format, no-wrap
+#~ msgid ""
+#~ "\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
+#~ "regular directory, another location can be specified with the environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  Nen�-li zad�n argument TEXTOV�DOM�NA, pak je dom�na z�sk�na z prom�nn�\n"
+#~ "prost�ed� TEXTDOMAIN. Jestli�e katalog se zpr�vami nen� nalezen\n"
+#~ "v p�edpokl�dan�m adres��i, pak je tento katalog hled�n v adres��i, zadan�m\n"
+#~ "v prom�nn� prost�ed� TEXTDOMAINDIR.\n"
+#~ "  Adres��, ve kter�m se hled�: %s\n"
+
+#, c-format
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+# src/xgettext.c:537
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "      --debug                    more detailed formatstring recognision result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Pou�it�: %s [P�EP�NA�] VSTUPN�SOUBOR ...\n"
+#~ "  Argumenty povinn� pro dlouh� p�ep�na�e, jsou t� povinn� pro jejich kr�tk�\n"
+#~ "formy.\n"
+#~ "\n"
+#~ "  -a, --extract-all             extrahuje v�echny �et�zce\n"
+#~ "  -c, --add-comments[=JMENOVKA] um�st� blok koment��e se JMENOVKOU (nebo ty,\n"
+#~ "                                kter� p�edch�zej� ��dku s kl��ov�m slovem)\n"
+#~ "                                do v�stupn�ho souboru\n"
+#~ "  -C, --c++                     zkratka pro --language=C++\n"
+#~ "      --debug                   detailn�j�� informace o rozpozn�v�n�\n"
+#~ "                                form�tovac�ch �et�zc�\n"
+#~ "  -d, --default-domain=JM�NO    pou�ije JM�NO.po pro v�stup (m�sto messages.po)\n"
+#~ "  -D, --directory=ADRES��       p�id� ADRES�� do seznamu adres���, ve kter�ch\n"
+#~ "                                se hledaj� vstupn� soubory\n"
+#~ "  -e, --no-escape               nepou��v� C escape sekvence ve v�stupu\n"
+#~ "                                (implicitn�)\n"
+#~ "  -E, --escape                  pou��v� C escape sekvence ve v�stupu, bez\n"
+#~ "                                roz���en�ch znak�\n"
+#~ "  -f, --files-from=SOUBOR       seznam vstupn�ch soubor� bude �ten ze SOUBORu\n"
+#~ "      --force-po                zap��e .po soubor, i kdy� bude pr�zdn�\n"
+#~ "      --foreign-user            vynech� copyright FSF ve v�stupu \n"
+#~ "  -F, --sort-by-file            se�ad� v�stup podle um�st�n� zpr�v\n"
+#~ "                                ve zdrojov�ch souborech\n"
+
+# src/xgettext.c:555
+#, no-wrap
+#~ msgid ""
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "  -j, --join-existing            join messages with existing file\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
+#~ "                                 otherwise is guessed from file extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ msgstr ""
+#~ "  -h, --help                    vyp��e tuto n�pov�du a ukon�� se\n"
+#~ "  -i, --indent                  ve v�stupn�m .po souboru pou�ije odsazen� styl\n"
+#~ "  -j, --join-existing           spoj� zpr�vy z existuj�c�ch soubor�\n"
+#~ "  -k, --keyword[=SLOVO]         dodate�n� kl��ov� slovo, kter� bude hled�no\n"
+#~ "                                (bez SLOVA, znamen� nepou�it� implicitn�ch\n"
+#~ "                                kl��ov�ch slov)\n"
+#~ "  -L, --language=N�ZEV          zad�n� jazyka (C, C++)           \n"
+#~ "  -m, --msgstr-prefix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p�edponu pro\n"
+#~ "                                polo�ky msgstr\n"
+#~ "  -M, --msgstr-suffix[=�ET�ZEC] pou�ije �ET�ZEC nebo \"\" jako p��ponu pro\n"
+#~ "                                polo�ky msgstr\n"
+#~ "      --no-location             potla�� ��dky '#: jm�no_souboru:��dek'\n"
+
+# src/xgettext.c:569
+#, no-wrap
+#~ msgid ""
+#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ "  -n, --add-location            vytv��� ��dky '#: jm�no_souboru:��dek' (impl.)\n"
+#~ "      --omit-header             nezapisuje hlavi�ku s `msgid \"\"' polo�kou\n"
+#~ "  -o, --output=SOUBOR           zap��e v�stup do ur�en�ho souboru\n"
+#~ "  -p, --output-dir=ADRES��      v�stupn� soubory budou um�st�ny do adres��e\n"
+#~ "                                ADRES��\n"
+#~ "  -s, --sort-output             generuje se�azen� v�stup bez duplicitn�ch zpr�v\n"
+#~ "      --strict                  v�stupn� soubor bude stylu Uniforum\n"
+#~ "  -T, --trigraphs               zapne podporu ANSI C `trigraphs' na vstupu\n"
+#~ "  -V, --version                 vyp��e ozna�en� verze a ukon�� se\n"
+#~ "  -w, --width=��SLO             nastav� v�stupn� ���ku str�nky\n"
+#~ "  -x, --exclude-file=SOUBOR     soubory ze SOUBORu nebudou zpracov�ny \n"
+#~ "\n"
+#~ "  Bude-li VSTUPN�SOUBOR -, bude �ten standardn� vstup.\n"
+
+# src/xget-lex.c:914
+#, c-format
+#~ msgid "%s:%d: warning: keyword nested in keyword arg"
+#~ msgstr ""
+#~ "%s:%d: upozorn�n�: kl��ov� slovo uhn�zd�no v argumentu kl��ov�ho slova"
+
+#, c-format
+#~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
+#~ msgstr ""
+#~ "%s:%d: upozorn�n�: kl��ov� slovo mezi krajn�m kl��ov�m slovem\n"
+#~ "a jeho argumentem"
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index 1d40e83e6..71b300a4f 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-05-10 23:48+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,19 +17,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "Ugyldigt argument %s for %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "flertydigt argument %s for %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
@@ -57,146 +58,133 @@ msgstr "kan ikke fjerne midlertidigt katalog %s"
 msgid "write error"
 msgstr "skrivefejl"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "bevarere tilladelser for %s"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "fejl ved l�se-�bning af %s"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "Kan ikke �bne sikkerhedskopi-fil %s for skrivning"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "fejl ved l�sning af %s"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "fejl ved skrivning til filen %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, 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:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() mislykkedes"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C#-overs�tter ikke fundet, fors�g at installere pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C# virtuel maskine ikke fundet, fors�g at installere pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-underproces mislykkedes"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: tilvalget '-W %s' er flertydigt\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: tilvalget '%s' er flertydigt, muligheder: "
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, 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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukendt tilvalg '%c%s'\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: tilvalget '--%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukendt tilvalg '--%s'\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukendt tilvalg '%c%s'\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget kr�ver et argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tilvalget '-W %s' er flertydigt\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, 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:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tilvalget '-W %s' kr�ver et argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ugyldigt source_version argument til compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ugyldigt target_version argument til compile_java_clas"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, 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"
@@ -204,49 +192,50 @@ msgstr "Javakompilator ikke fundet, fors�g at installere gcj eller s�t $JAVAC"
 #: gnulib-lib/javaexec.c:417
 #, c-format
 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"
+msgstr ""
+"Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�t $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
-#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "oprettelse af tr�de mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:405
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "l�sning fra %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, fuzzy, c-format
 #| msgid "write to %s subprocess failed"
 msgid "communication with %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, fuzzy, c-format
 #| msgid "%s subprocess failed with exit code %d"
 msgid "%s subprocess terminated with exit code %d"
@@ -271,13 +260,13 @@ msgstr "%s-underproces fejlede med slutstatus %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "'"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
@@ -286,56 +275,210 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan ikke oprette datakanal"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle mislykkedes"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke genskabe filnummer %d: dup2 mislykkedes"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s underproces"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s underproces fik et d�deligt signal %d"
 
-#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:258 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "fejl ved l�se-�bning af '%s'"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:151
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "'%s' er ikke en gyldig %s-formatstreng, til forskel fra '%s'. �rsag: %s"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Brug: %s [TILVALG] [FIL]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det tilsvarende\n"
+"korte tilvalg.\n"
+"Tilvarende g�lder for valgfri argumenter.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  vis denne hj�lp og afslut\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  vis denne hj�lp og afslut\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               vis versionsinformation og afslut\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright � %s Free Software Foundation, Inc.\n"
+"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
+"Dette program er frit programmel.  Du kan �ndre og distribuere det.\n"
+"Det er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrevet af %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "kan ikke fjerne midlertidigt katalog %s"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "fejl ved l�se-�bning af '%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-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "et formateringsdirektiv for argument '%u', som i '%s', findes ikke i '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"et formateringsdirektiv for argument '%u', som i '%s', findes ikke i '%s'"
 
 #: 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-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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'"
@@ -343,8 +486,8 @@ msgstr "formateringsdirektiv for argument %u findes ikke i '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
 #: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
 #: src/format-tcl.c:421
 #, c-format
@@ -356,10 +499,21 @@ msgstr "formatangivelser i '%s' og '%s' for argument %u er ikke ens"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiv nummer %u begynder med | men afsluttes ikke med |."
 
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"'%s' er ikke en gyldig %s-formatstreng, til forskel fra '%s'. �rsag: %s"
+
 #: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "I direktiv nummer %u er symbolet efter '<' ikke navnet p� en formateringsmakro. Gyldige mmakroeravne er definerede i ISO C 99, kapitel 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"I direktiv nummer %u er symbolet efter '<' ikke navnet p� en "
+"formateringsmakro. Gyldige mmakroeravne er definerede i ISO C 99, kapitel "
+"7.8.1."
 
 #: src/format-c.c:39
 #, c-format
@@ -369,44 +523,50 @@ msgstr "I direktiv nummer %u f�lges symbolet efter '<' ikke af '>'."
 #: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Strengen refererer til argument nummer %u men ignorerer argument nummer %u."
+msgstr ""
+"Strengen refererer til argument nummer %u men ignorerer argument nummer %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antal af formatangivelser i '%s' og '%s' er ikke overensstemmende"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "I direktiv nummer %u f�lges '{' ikke af et argumentnummer."
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "I direktiv nummer %u f�lges ikke ',' af et nummer."
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Strengen slutter midt i et direktiv:fandthittade '{' uden tillh�rende '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Strengen slutter midt i et direktiv:fandthittade '{' uden tillh�rende '}'."
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Direktiv nummer %u afsluttes med det ugyldige tegnet '%c' i stedet for '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Direktiv nummer %u afsluttes med det ugyldige tegnet '%c' i stedet for '}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Direktiv nummer %u afsluttes med et ugyldigt tegn i stedet for '}'."
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "Strengen starter midt i et direktiv: fandt '}' uden tillh�rende '{'."
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Strengen indeholder et enligt '}' efter direktiv nummer %u."
@@ -423,13 +583,18 @@ msgstr "I direktiv nummer %u: en precision er ikke tilladt f�r '%c'."
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "I direktiv nummer %u skal argumentnumret for precisionen v�re lig %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "I direktiv nummer %u er en precisionsspecifikation ikke tilladt f�r '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"I direktiv nummer %u er en precisionsspecifikation ikke tilladt f�r '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -468,33 +633,51 @@ msgid "The string ends in the middle of a directive."
 msgstr "Strengen afsluttes midt i et direktiv."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Strengen refererer til argumenter b�de via absolutte argumentnummre og via unummererede argumentspecifikationer."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Strengen refererer til argumenter b�de via absolutte argumentnummre og via "
+"unummererede argumentspecifikationer."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "I direktiv nummer %u er argument nummer 0 ikke et positivt heltal."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "I direktiv nummer %u er breddens argument nummer 0 ikke et positivt heltal."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"I direktiv nummer %u er breddens argument nummer 0 ikke et positivt heltal."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "I direktiv nummer %u er precisionens argument nummer 0 ikke et positivt heltal."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"I direktiv nummer %u er precisionens argument nummer 0 ikke et positivt "
+"heltal."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "I direktiv nummer %u er tegnet '%c' ikke en gyldig konvertering."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Tegnet som afslutter direktiv nummer %u er ikke en gyldig konverteringsangivelse."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Tegnet som afslutter direktiv nummer %u er ikke en gyldig "
+"konverteringsangivelse."
 
 #: src/format-invalid.h:40
 #, c-format
@@ -503,7 +686,9 @@ msgstr "Strengen refererer til argument nummer %u p� inkompatibel m�de."
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "I direktiv nummer %u er delstrengen '%s' ikke en gyldig dato/tid-stil."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
@@ -513,13 +698,18 @@ msgstr "I direktiv nummer %u f�lges '%s' ikke af et komma."
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "I direktiv nummer %u er delstrengen '%s' ikke en gyldig nummerstil."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "I direktiv nummer %u f�lges argumentnummret ikke af et komma og en af '%s', '%s', '%s', '%s'."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"I direktiv nummer %u f�lges argumentnummret ikke af et komma og en af '%s', "
+"'%s', '%s', '%s'."
 
 #: src/format-java.c:572
 #, c-format
@@ -528,13 +718,19 @@ msgstr "I direktiv nummer %u indeholder et valg intet nummer."
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "I direktiv nummer %u indeholder et valg et nummer som ikke f�lges af '<', '#' eller '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"I direktiv nummer %u indeholder et valg et nummer som ikke f�lges af '<', "
+"'#' eller '%s'."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "et formateringsdirektiv for argument {%u}, som i '%s', findes ikke i '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"et formateringsdirektiv for argument {%u}, som i '%s', findes ikke i '%s'"
 
 #: src/format-java.c:756
 #, c-format
@@ -543,159 +739,229 @@ msgstr "et formateringsdirektiv for argument {%u} findes ikke i '%s'"
 
 #: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formatangivelser i '%s' og '%s' for argument {%u} er ikke det samme"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
-#, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "I direktiv nummer %u har parameter %u type '%s' men en parameter af type '%s' forventedes."
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Strengen refererer til argument nummer %u men ignorerer argument nummer %u."
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"et formateringsdirektiv for argument '%u', som i '%s', findes ikke i '%s'"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "fejl ved l�sning af '%s'"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "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."
-msgstr[0] "I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u parrameter."
-msgstr[1] "I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u parrametre."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"I direktiv nummer %u har parameter %u type '%s' men en parameter af type "
+"'%s' forventedes."
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+"I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u "
+"parrameter."
+msgstr[1] ""
+"I direktiv nummer %u er der givet for mange parametre, forventede h�jst %u "
+"parrametre."
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "I direktiv nummer %u f�lges '%c' ikke af et ciffer."
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "I direktiv nummer %u er argument %d negativt."
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Strengen afsluttes midt i et direktiv af type ~/.../."
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Fandt '~%c' uden tillh�rende '%c'."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "I direktiv nummer %u angives b�de modificererne @ og :."
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "I direktiv nummer %u f�lges '~:[' ikke af to s�tninger separerede med '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"I direktiv nummer %u f�lges '~:[' ikke af to s�tninger separerede med '~;'."
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "I direktiv nummer %u bruges '~;' i en fejlagtig position."
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Strengen refererer til et argument p� inkompatible m�de."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "formatangivelser i '%s' og '%s' er ikke de samme"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateringsdirektiver i '%s' er ikke en delm�ngde af dem i '%s'"
 
-#: src/format-perl.c:433
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "I direktiv nummer %u er st�rrelsesangiveren inkompatibel med konverteringen '%c'."
-
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "et formateringsdirektiv for argument '%s' findes ikke i '%s'"
 
-#: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Strengen refererer til argumenter b�de via argumentnavne og via navnl�se argumentspecifikationer."
-
-#: src/format-python.c:354
-#, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Strengen refererer til argumentet '%s' p� inkompatible m�de."
-
-#: src/format-python.c:430
-#, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "formateringsdirektiver i '%s' tager en afbildning, dem i '%s' tager en tuppel"
-
-#: src/format-python.c:437
-#, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "formateringsdirektiver i '%s' tager en tuppel, dem i '%s' tager en afbildning"
-
-#: 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 '%s'"
-msgstr "et formateringsdirektiv for argument '%s', som i '%s', findes ikke i '%s'"
-
-#: src/format-python.c:494
+#: src/format-perl.c:433
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "formateringsdirektiver i '%s' og '%s' for argument '%s' er ikke ens"
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"I direktiv nummer %u er st�rrelsesangiveren inkompatibel med konverteringen "
+"'%c'."
 
-#: src/format-python-brace.c:137
+#: src/format-python-brace.c:138
 #, fuzzy, c-format
 #| msgid "In the directive number %u, '%c' is not followed by a digit."
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "I direktiv nummer %u f�lges '%c' ikke af et ciffer."
 
-#: src/format-python-brace.c:150
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
-#| msgid "In the directive number %u, '{' is not followed by an argument number."
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "I direktiv nummer %u f�lges '{' ikke af et argumentnummer."
 
-#: src/format-python-brace.c:165
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 #| msgid "In the directive number %u, '%c' is not followed by a digit."
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "I direktiv nummer %u f�lges '%c' ikke af et ciffer."
 
-#: src/format-python-brace.c:185
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 #| msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "I direktiv nummer %u: en precision er ikke tilladt f�r '%c'."
 
-#: src/format-python-brace.c:270
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 #| msgid "In the directive number %u, the argument %d is negative."
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "I direktiv nummer %u er argument %d negativt."
 
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Strengen refererer til argumenter b�de via argumentnavne og via navnl�se "
+"argumentspecifikationer."
+
+#: src/format-python.c:354
+#, c-format
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr "Strengen refererer til argumentet '%s' p� inkompatible m�de."
+
+#: src/format-python.c:430
+#, c-format
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"formateringsdirektiver i '%s' tager en afbildning, dem i '%s' tager en tuppel"
+
+#: src/format-python.c:437
+#, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"formateringsdirektiver i '%s' tager en tuppel, dem i '%s' tager en afbildning"
+
+#: 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 '%s'"
+msgstr ""
+"et formateringsdirektiv for argument '%s', som i '%s', findes ikke i '%s'"
+
+#: src/format-python.c:494
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr "formateringsdirektiver i '%s' og '%s' for argument '%s' er ikke ens"
+
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' er en simpel formatstreng, men '%s' er det ikke; den indeholder et 'L'-flag eller et tocifret argumentantal"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' er en simpel formatstreng, men '%s' er det ikke; den indeholder et 'L'-"
+"flag eller et tocifret argumentantal"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Strengen refererer til en skalvariabel med et navn udenfor ASCII."
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Strengen refererer til en skalvariabel med kompleks kr�lleparentessyntaks.  Denne syntaks underst�ttes ikke her af sikkerheds�rsager."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Strengen refererer til en skalvariabel med kompleks kr�lleparentessyntaks.  "
+"Denne syntaks underst�ttes ikke her af sikkerheds�rsager."
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Strengen refererer til en skalvariabel hvis v�rdi kan v�re anderledes inde i skalfunktioner."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Strengen refererer til en skalvariabel hvis v�rdi kan v�re anderledes inde i "
+"skalfunktioner."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
@@ -703,153 +969,154 @@ msgstr "Strengen refererer til en skalvariabel uden navn."
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "I direktiv nummer %u er tegnet '%c' ikke et ciffer mellem 1 og 9."
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Tegnet som afslutter direktiv nummer %u er ikke et ciffer mellem 1 og 9."
-
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
-"Copyright � %s Free Software Foundation, Inc.\n"
-"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
-"Dette program er frit programmel.  Du kan �ndre og distribuere det.\n"
-"Det er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Skrevet af %s.\n"
+"Tegnet som afslutter direktiv nummer %u er ikke et ciffer mellem 1 og 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
-#: src/urlget.c:149
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, fuzzy, c-format
-#| msgid "Try `%s --help' for more information.\n"
-msgid "Try '%s --help' for more information.\n"
-msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
-
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Brug: %s [TILVALG]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Skriv maskinens v�rtsnavn.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Resultatformat:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 kort v�rtsnavn\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          langt v�rtsnavn, indholder fuldt kvalificeret\n"
 "                                dom�nenavn og aliaser\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser for v�rtsnavnet\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativt uddata:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  vis denne hj�lp og afslut\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "kunne ikke hente v�rtsnavn"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               vis versionsinformation og afslut\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "Mindst to filer skal angives"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "kan ikke oprette datakanal"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "kunne ikke hente v�rtsnavn"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "Ugyldigt argument %s for %s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "kan ikke oprette datakanal"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "kan ikke oprette uddatafil '%s'"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "H�jst �n inddatalinje tilladt"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
@@ -868,20 +1135,22 @@ msgstr ""
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
 #: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det tilsvarende\n"
+"Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det "
+"tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Placering for indfil:\n"
@@ -891,37 +1160,39 @@ msgstr "Placering for indfil:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-indfil\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=KATALOG     s�g ogs� efter indfiler i KATALOG\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
 #: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Hvis ingen indfil er givet eller hvis den er -, l�ses standard-ind.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Placering af uddatafil:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FIL       uddata skrives til FIL\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
 #: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
@@ -931,30 +1202,38 @@ msgstr ""
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelelsevalg:\n"
 
 #: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            behold oversatte, fjern uoversatte meddelelser\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            behold oversatte, fjern uoversatte "
+"meddelelser\n"
 
 #: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --translated            behold uoversatte, fjern oversatte meddelelser\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --translated            behold uoversatte, fjern oversatte "
+"meddelelser\n"
 
 #: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
+msgstr ""
+"      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
 
 #: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            behold meddelelser markerede som 'fuzzy'\n"
+msgstr ""
+"      --only-fuzzy            behold meddelelser markerede som 'fuzzy'\n"
 
 #: src/msgattrib.c:460
 #, c-format
@@ -979,7 +1258,8 @@ msgstr "      --set-fuzzy             mark�r alle meddelelser som 'fuzzy'\n"
 #: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           fjern 'fuzzy'-markering fra alle meddelelser\n"
+msgstr ""
+"      --clear-fuzzy           fjern 'fuzzy'-markering fra alle meddelelser\n"
 
 #: src/msgattrib.c:471
 #, c-format
@@ -989,36 +1269,51 @@ msgstr "      --set-obsolete          mark�r alle meddelelser som for�ldede\n"
 #: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        fjern for�ldelsesmarkering fra alle meddelelser\n"
+msgstr ""
+"      --clear-obsolete        fjern for�ldelsesmarkering fra alle "
+"meddelelser\n"
 
 #: src/msgattrib.c:475
 #, fuzzy, c-format
-#| msgid "      --previous              keep previous msgids of translated messages\n"
+#| msgid ""
+#| "      --previous              keep previous msgids of translated "
+#| "messages\n"
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
-msgstr "      --previous              behold tidligere 'msgid' for oversatte meddelelser\n"
+msgstr ""
+"      --previous              behold tidligere 'msgid' for oversatte "
+"meddelelser\n"
 
 #: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        fjern 'previous msgid' fra alle meddelelser\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        fjern 'previous msgid' fra alle meddelelser\n"
 
 #: src/msgattrib.c:480
 #, fuzzy, c-format
 #| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
 
 #: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=FIL.po      bearbejd kun poster som findes i FIL.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FIL.po      bearbejd kun poster som findes i FIL.po\n"
 
 #: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=FIL.po    bearbejd kun poster som ikke findes i FIL.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FIL.po    bearbejd kun poster som ikke findes i FIL.po\n"
 
 #: src/msgattrib.c:486
 #, c-format
@@ -1027,131 +1322,150 @@ msgstr "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
 
 #: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              samme som --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              samme som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
 #: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntaks p� indfil:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      indfil har 'Java .properties'-syntaks\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     indfil har NeXTstep/GNUstep '.strings'-syntaks\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     indfil har NeXTstep/GNUstep '.strings'-"
+"syntaks\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 brug altid farver og andre tekstattributter\n"
-"      --color=VILK�R          brug farver og andre textattributter afh�ngig af\n"
-"                              VILK�R, som kan v�re 'always', 'never', 'auto'\n"
+"      --color=VILK�R          brug farver og andre textattributter afh�ngig "
+"af\n"
+"                              VILK�R, som kan v�re 'always', 'never', "
+"'auto'\n"
 "                              eller 'html'.\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STILSKABELON    angiv CSS stilskabel�nfil for --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
 "                                (normaltilstand)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                brug C-kontrolsekvenser i resultatet, men\n"
 "                              ikke \\v eller \\a\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              skriv PO-fil selv hvis den er tom\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                lav indrykningsst�l i .po-fil\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
+msgstr ""
+"      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          skriv linjer med '#: filnavn:linje' (normaltilstand)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          skriv linjer med '#: filnavn:"
+"linje' (normaltilstand)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    skriv en NeXTstep/GNUstep '.strings'-fil\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    skriv en NeXTstep/GNUstep '.strings'-fil\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANTAL           s�t sidebredde for uddata\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1160,31 +1474,31 @@ msgstr ""
 "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sort�r resultatet\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort�r resultatet efter filposition\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "Concatenates and merges the specified PO files.\n"
@@ -1216,23 +1530,23 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   indfiler\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FIL        l�s liste af indfiler fra FIL\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Hvis indfil er -, l�ses standard ind.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1241,7 +1555,7 @@ msgstr ""
 "  -<, --less-than=ANTAL       skriv meddelelser med mindre end ANTAL\n"
 "                              definitioner. Standardv�rdi: uendeligt\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1250,7 +1564,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardv�rdi: 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1259,26 +1573,30 @@ msgstr ""
 "  -u, --unique                samme som --less-than=2, anfordrer at\n"
 "                              kun unikke meddelelser skrives\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      indfiler har 'Java .properties'-syntaks\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      indfiler har 'Java .properties'-syntaks\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     indfiler har NeXTstep/GNUstep '.strings'-syntaks\n"
+msgstr ""
+"      --stringtable-input     indfiler har NeXTstep/GNUstep '.strings'-"
+"syntaks\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAVN          kodning for resultatet\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1287,32 +1605,33 @@ msgstr ""
 "      --use-first             anvend f�rst fundne overs�ttelse for hver\n"
 "                              meddelelse, sammenflet ikke overs�ttelser\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOGNAVN      s�t 'Language'-feltet i hovedet\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "ingen filer angivet som inddata"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "der kr�ves netop to inddatafiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1331,37 +1650,39 @@ msgstr ""
 "mellem msgid-tekststrengene, benyttes en upr�cis sammenligningsmetode til at\n"
 "give bedre fejlretningsinformation.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      overs�ttelser\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referencer til kildetekst\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Bearbejdningsvarianter:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr "  -m, --multi-domain          brug ref.pot til hvert dom�ne i def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:568
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     brug ikke upr�cis sammenligning\n"
 
-#: src/msgcmp.c:245
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             brug upr�cise poster i resultatet\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      brug uoversatte meddelelser\n"
@@ -1376,17 +1697,17 @@ msgstr "advarsel: denne tekst er uoversat"
 msgid "this message needs to be reviewed by the translator"
 msgstr "denne meddelelse b�r gennemses af overs�tteren"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne tekst bruges, men er ikke erkl�ret..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denne tekst ligner"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne tekst er brugt, men ikke erkl�ret i %s"
@@ -1396,19 +1717,19 @@ msgstr "denne tekst er brugt, men ikke erkl�ret i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Mindst to filer skal angives"
 
-#: src/msgcomm.c:364
+#: 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"
@@ -1437,7 +1758,7 @@ 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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1446,10 +1767,12 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardv�rdi: 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, fuzzy, c-format
-#| msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+#| msgid ""
+#| "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr "      --omit-header           udskriv ikke hovedet med 'msgid \"\"'\n"
 
 #: src/msgconv.c:311
@@ -1467,31 +1790,37 @@ msgstr "Konverteringsm�l:\n"
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Standardindkodning er nuv�rende locales indkodning.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                lav indrykningsst�l i resultatet\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
+msgstr ""
+"      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, fuzzy, c-format
-#| msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "      --add-location          bevar linjer med '#: filnavn:linje' (normaltilstand)\n"
+#| msgid ""
+#| "      --add-location          preserve '#: filename:line' lines "
+#| "(default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          bevar linjer med '#: filnavn:"
+"linje' (normaltilstand)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
@@ -1523,17 +1852,17 @@ msgstr ""
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INFIL                       PO- eller POT-indfil\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "kommandonavn mangler"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Brug: %s [TILVALG] KOMMANDO [KOMMANDOTILVALG]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1548,7 +1877,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:271
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1558,37 +1887,49 @@ msgstr ""
 "af et nultegn. Uddata for 'msgexec 0' er brugbart som inddata for\n"
 "'xargs -O'\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "standard-inddata"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  vis denne hj�lp og afslut\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INFIL           PO-indfil\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning til standard ud mislykkedes"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "filternavn mangler"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "mindst et sed-skript skal angives"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:417
 #, 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:435
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1597,243 +1938,301 @@ 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:440
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Brugbare FILTERFLAG n�r FILTER er 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SKRIPT     tilf�j SKRIPT til kommandoerne som skal udf�res\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=SKRIPT     tilf�j SKRIPT til kommandoerne som skal "
+"udf�res\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=SKRIPTFIL        tilf�j indeholdet i SKRIPTFIL til kommandoerne\n"
+"  -f, --file=SKRIPTFIL        tilf�j indeholdet i SKRIPTFIL til "
+"kommandoerne\n"
 "                                som skal udf�res\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       undertryk automatisk udskrift af m�nsteromr�det\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       undertryk automatisk udskrift af "
+"m�nsteromr�det\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
 "                                (normaltilstand)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                lav indrykningsst�l i resultatet\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           bevar headerlinjer u�ndrede, filtr�r dem ikke\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           bevar headerlinjer u�ndrede, filtr�r dem ikke\n"
+
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:372
 #, 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:392
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ugyldig byteorden: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
+#: src/msgfmt.c:471
 #, fuzzy, c-format
 #| msgid "If no input file is given or if it is -, standard input is read.\n"
 msgid "no input file should be given if %s and %s are specified"
 msgstr "Hvis ingen indfil er givet eller hvis den er -, l�ses standard-ind.\n"
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:538
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, fuzzy, c-format
 #| msgid "%s requires a \"-l locale\" specification"
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s kr�ver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:545
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, fuzzy, c-format
 #| msgid "%s requires a \"-l locale\" specification"
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s kr�ver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:551
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, fuzzy, c-format
 #| msgid "%s and %s are mutually exclusive"
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:626 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:571 src/msgfmt.c:577
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s er kun gyldig med %s, %s eller %s"
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "kan ikke oprette uddatafil '%s'"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:881
 #, 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:754
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:910
 #, 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:783 src/xgettext.c:864
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
 msgstr ""
-"Hvis et langt tilvalg kr�ver et argument, g�lder det ogs� for det tilsvarende\n"
-"korte tilvalg.\n"
-"Tilvarende g�lder for valgfri argumenter.\n"
+"Gener�r bin�rt tekstkatalog fra overs�ttelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnavn.po ...              indfiler\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "K�rselstilstand:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Javatilstand: gener�r en Java ResourceBundle-klasse\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Javatilstand: gener�r en Java ResourceBundle-"
+"klasse\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 som --java, og antag Java2 (JDK 1.2 eller h�jere)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 som --java, og antag Java2 (JDK 1.2 eller "
+"h�jere)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-tilstand: gener�r en .NET .dll-fil\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-ressurcetilstand: gener�r en .NET .resources-fil\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-ressurcetilstand: gener�r en .NET ."
+"resources-fil\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-tilstand: gener�r en .msg-fil af tcl/msgcat-type\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-tilstand: gener�r en .msg-fil af tcl/"
+"msgcat-type\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
 
-#: src/msgfmt.c:811
+#: src/msgfmt.c:943
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
+
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 #| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Hvis UDFIL er -, skrives resultatet til standard ud.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Placering af uddatafil i Javatilstand:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    ressourcenavn\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
 
-#: src/msgfmt.c:829
+#: src/msgfmt.c:963
 #, fuzzy, c-format
-#| msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-fil\n"
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d KATALOG                  startkatalog for klassers katalogtr�\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1841,17 +2240,20 @@ msgstr ""
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Placering for udfil i C#-tilstand:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d KATALOG                  startkatalog for localeafh�ngige .dll-filer\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d KATALOG                  startkatalog for localeafh�ngige .dll-filer\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1860,17 +2262,18 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .dll filen bliver skrevet i et\n"
 "underkatalog af det angivne katalog, hvis navn afh�nger af localet.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Placering for udfil i Tcl-tilstand:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
+msgstr ""
+"  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1879,23 +2282,25 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
 "angivne katalog.\n"
 
-#: src/msgfmt.c:861
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, fuzzy, c-format
-#| msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
+#| msgid ""
+#| "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
+msgstr ""
+"  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
 
-#: src/msgfmt.c:871 src/xgettext.c:934
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -1904,173 +2309,202 @@ msgstr ""
 "  -kORD, --keyword[=ORD]      s�g efter ORD som et ekstra n�gleord\n"
 "  -k, --keyword               brug ikke standardn�gleord\n"
 
-#: src/msgfmt.c:874
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning af indfil:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 udf�r alle kontroller som bestemmes af\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          kontroll�r sprogafh�ngige formatstrenge\n"
+msgstr ""
+"      --check-format          kontroll�r sprogafh�ngige formatstrenge\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          verific�r tilstedev�relse og indhold af headerlinjen\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          verific�r tilstedev�relse og indhold af "
+"headerlinjen\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          kontroll�r for konflikter mellem dom�nedirektiver\n"
+"      --check-domain          kontroll�r for konflikter mellem "
+"dom�nedirektiver\n"
 "                                og flaget --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   kontroll�r at GNU msgfmt opf�rer sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=TKN]   kontroll�r tilstedev�relsen af kortvejskommandoer\n"
+"      --check-accelerators[=TKN]   kontroll�r tilstedev�relsen af "
+"kortvejskommandoer\n"
 "                                for menuer\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             brug upr�cise poster i resultatet\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=TAL         l�g strenge p� lige TAL byte (normalt: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=TAL         l�g strenge p� lige TAL byte (normalt: %d)\n"
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               bin�rfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            udskriv statistik om overs�ttelserne\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               �g m�ngden af information i meddelelsen\n"
+msgstr ""
+"  -v, --verbose               �g m�ngden af information i meddelelsen\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegns�tskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "advarsel: PO-filhoved er uafklaret\n"
-
-#: src/msgfmt.c:1052
-#, 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:1076
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dom�net '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:1216
 #, 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:1095
+#: src/msgfmt.c:1230
 #, fuzzy, c-format
 #| msgid "`domain %s' directive ignored"
 msgid "'domain %s' directive ignored"
 msgstr "'domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1290
 #, fuzzy, c-format
 #| msgid "empty `msgstr' entry ignored"
 msgid "empty 'msgstr' entry ignored"
 msgstr "tom 'msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1291
 #, fuzzy, c-format
 #| msgid "fuzzy `msgstr' entry ignored"
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "'fuzzy' 'msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
+msgstr ""
+"%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
 
-#: src/msgfmt.c:1323
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1334
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:87
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:171 src/x-librep.c:147 src/x-lisp.c:212
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:163 src/x-python.c:176 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-vala.c:176
-#: src/x-ycp.c:91
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
 #: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "flaget '%c' kan ikke bruges f�rend 'J' eller 'K' eller 'T' eller 'C' eller 'X' er blevet angivet"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"flaget '%c' kan ikke bruges f�rend 'J' eller 'K' eller 'T' eller 'C' eller "
+"'X' er blevet angivet"
 
 #: src/msggrep.c:521
 #, c-format, no-wrap
@@ -2159,7 +2593,8 @@ msgstr ""
 
 #: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                brug C-kontrolsekvenser i resultatet, men\n"
 "                                ikke \\v eller \\a\n"
@@ -2174,17 +2609,23 @@ msgstr "      --sort-output           sort�r resultatet\n"
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort�r resultatet efter filposition\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Du befinder dig i et sproguafh�ngigt milj�. S�t din milj�variabel\n"
 "LANG som beskrevet i filen ABOUT-NLS. Dette er n�dvendigt for at\n"
 "du kan teste dine overs�ttelser.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2195,12 +2636,12 @@ msgstr ""
 "Angiv locale med flaget --locale eller\n"
 ".po-udfilen med flaget --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Oprettede %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2209,45 +2650,49 @@ msgstr ""
 "Opretter en ny PO-fil og initierer metainformation med v�rdier fra\n"
 "brugerens milj�variabler.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INDFIL          POT-indfil\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 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:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FIL       uddata skrives til den sngivne PO-fil\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"Hvis ingen udfil er angivet, afh�nger det af --locale tilvalget eller brugerens\n"
+"Hvis ingen udfil er angivet, afh�nger det af --locale tilvalget eller "
+"brugerens\n"
 "indstilling af locale. Hvis den er -, skrives resultaterne p� standard ud.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          s�t m�llocale\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         antag at PO-filen er automatgenereret\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2255,12 +2700,12 @@ msgstr ""
 "Fandt mere end en .pot-fil.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "fejl ved l�sning af aktuelt katalog"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2268,17 +2713,19 @@ msgstr ""
 "Fandt ingen .pot-fil i aktuelt katalog.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: 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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-underproces fejlede med slutstatus %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Det nye beskedkatalog b�r indeholde din e-postadresse s�\n"
@@ -2288,46 +2735,55 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Danske overs�ttelser for pakke %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:203
 #, fuzzy, c-format
-#| msgid "input file `%s' doesn't contain a header entry with a charset specification"
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+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:207
 #, fuzzy, c-format
-#| msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
-msgid "domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "dom�ne '%s' i indfil '%s' mangler en indgang i hovedet med angivelse af tegns�t"
+#| msgid ""
+#| "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+#| "charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"dom�ne '%s' i indfil '%s' mangler en indgang i hovedet med angivelse af "
+"tegns�t"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3426
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2336,10 +2792,11 @@ msgstr ""
 "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
 "Konverterer resultatet til UTF-8.\n"
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2347,7 +2804,7 @@ msgstr ""
 "Konverterer resultatet til UTF-8.\n"
 "Brug flaget --to-code for at v�lge en anden kodning.\n"
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2358,10 +2815,11 @@ msgstr ""
 "Konvertering af filen %s fra tegnkodning %s til tegnkodning %s �ndrer\n"
 "nogle msgid'er eller msgctxt'er.\n"
 "Enten �ndrer du alle msgid'er og msgctxt'er til at kun ineholde ASCII\n"
-"eller s�rg for at de er UTF-8-kodede fra begyndelsen, d.v.s. allerede i dine\n"
+"eller s�rg for at de er UTF-8-kodede fra begyndelsen, d.v.s. allerede i "
+"dine\n"
 "kildetekstsfiler.\n"
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2374,12 +2832,12 @@ msgstr ""
 "Resultatet for '%s' kan blive forkert.\n"
 "Mulige m�der at omg� problemet er:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, 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:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2390,7 +2848,7 @@ msgstr ""
 "  udf�r derefter '%s',\n"
 "  konvert�r s� tilbage til %s med 'msgconv'.\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2403,7 +2861,7 @@ msgstr ""
 "  udf�r derefter '%s'\n"
 "  konvert�r s� tilbage til %s med 'msgconv'.\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2414,137 +2872,164 @@ 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:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "flertalsudtryk kan give negative v�rdier"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, 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:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "flertalsudtryk kan give division med nul"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "flertalsudtryk kan give heltalsoverl�b"
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+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:266
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Pr�v at bruge det f�lgende, g�ldende for %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "tekstkatalog har overs�ttelser med flertalsform"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "men headerindgange mangler attribut af type 'plurals=UDTRYK'"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "men headerindgange mangler attribut af type 'plurals=HELTAL'"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-v�rdi"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:478
 #, 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:490
+#: src/msgl-check.c:494
 #, 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:514
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "beskedkatalog har overs�ttelser med flertalsformer, men mangler en headerindgang med 'Plural-Forms: nplurals=HELTAL; plural=UDTRYK;'"
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"beskedkatalog har overs�ttelser med flertalsformer, men mangler en "
+"headerindgang med 'Plural-Forms: nplurals=HELTAL; plural=UDTRYK;'"
 
-#: src/msgl-check.c:611
+#: src/msgl-check.c:616
 #, fuzzy
 #| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 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:619
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 #| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 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:634
+#: src/msgl-check.c:639
 #, fuzzy
 #| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 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:652
+#: src/msgl-check.c:657
 #, fuzzy
 #| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 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:660
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 #| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 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:675
+#: src/msgl-check.c:680
 #, fuzzy
 #| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 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:687
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler m�rket '%c' for tastaturgenvej"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:744
 #, 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:814
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 #| msgid "header field `%s' still has the initial default value\n"
 msgid "header field '%s' still has the initial default value\n"
 msgstr "feltet '%s' i hovedet har stadig den oprindelige standardv�rdi\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 #| msgid "header field `%s' missing in header\n"
 msgid "header field '%s' missing in header\n"
 msgstr "feltet '%s' mangler i hovedet\n"
 
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2553,39 +3038,52 @@ msgstr "%s: inddata er ikke gyldig i tegnkodningen '%s'"
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: fejl opstod ved konvertering fra tegnkodning '%s' til tegnkodning '%s'"
+msgstr ""
+"%s: fejl opstod ved konvertering fra tegnkodning '%s' til tegnkodning '%s'"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(), og iconv() underst�tter ikke denne konvertering."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(), og iconv() "
+"underst�tter ikke denne konvertering."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Konvertering fra '%s' til '%s' giver dubletter: nogle msgid'er som er forskellige bliver ens."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konvertering fra '%s' til '%s' giver dubletter: nogle msgid'er som er "
+"forskellige bliver ens."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(). Denne version er bygget uden iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Kan ikke konvertere fra '%s' til '%s'. %s bygger p� iconv(). Denne version "
+"er bygget uden iconv()."
 
-#: src/msgmerge.c:405 src/msgmerge.c:411
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s er kun gyldig med %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "sikkerhedskopitype"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2609,17 +3107,19 @@ msgstr ""
 "overensstemmelse, vil 'l�s s�gning' (fuzzy matching) blive brugt til at give\n"
 "bedre resultater.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      overs�ttelser som refererer til gamle kildetekster\n"
+msgstr ""
+"  def.po                      overs�ttelser som refererer til gamle "
+"kildetekster\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencer til ny kildetekst\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2628,39 +3128,41 @@ msgstr ""
 "  -C, --compendium=FIL        yderligere kataloger med overs�ttelser,\n"
 "                              kan angives flere gange\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                opdat�r def.po,\n"
-"                              g�r ingenting hvis def.po allerede er opdateret\n"
+"                              g�r ingenting hvis def.po allerede er "
+"opdateret\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Placering af udfil i opdateringstilstand:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Resultatet skrives tilbage til def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        lav en sikkerhedskopi af def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=ENDELSE        brug en anden endelse end den normale\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2671,48 +3173,66 @@ msgstr ""
 "VERSION_CONTROL.  Her er v�rdierne:\n"
 "  none, off       lav aldrig sikkerhedskopier (selv hvis --backup angives)\n"
 "  numbered, t     lav nummererede sikkerhedskopier\n"
-"  existing, nil   nummererede sikkerhedskopier hvis der findes s�danne, ellers simple\n"
+"  existing, nil   nummererede sikkerhedskopier hvis der findes s�danne, "
+"ellers simple\n"
 "  simple, never   lav altid simple sikkerhedskopier\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:601
 #, fuzzy, c-format
 #| msgid ""
-#| "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+#| "The backup suffix is `~', unless set with --suffix or the "
+#| "SIMPLE_BACKUP_SUFFIX\n"
 #| "environment variable.\n"
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Endelse for sikkerhedskopier er '~', hvis den ikke s�ttes med --suffix eller\n"
+"Endelse for sikkerhedskopier er '~', hvis den ikke s�ttes med --suffix "
+"eller\n"
 "milj�variablen SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 genkend Boost-formatstrenge\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              behold tidligere 'msgid' for oversatte meddelelser\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              behold tidligere 'msgid' for oversatte "
+"meddelelser\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       vis ikke forl�bsindikatorer\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "denne tekst burde definere flertalsformer"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "denne tekst burde ikke definere flertalsformer"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2110
 #, 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"
+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"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " afsluttet.\n"
@@ -2734,23 +3254,35 @@ msgstr "Konvert�r et bin�r beskedskatalog til en .po-fil af Uniforum-type\n"
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Javatilstand: inddata er en Java ResourceBundle-klasse\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
 
 #: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                C#-tilstand: inddata er en .NET .dll-fil\n"
+msgstr ""
+"      --csharp                C#-tilstand: inddata er en .NET .dll-fil\n"
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-ressurcetilstand: inddata er en .NET .resources-fil\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-ressurcetilstand: inddata er en .NET ."
+"resources-fil\n"
 
 #: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-fil\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
 
 #: src/msgunfmt.c:451
 #, c-format
@@ -2765,7 +3297,8 @@ msgstr "Placering for indfil i Javatilstand:\n"
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Klassenavnet bestemmes ved at tilf�je localenavnet til ressourcenavnet\n"
@@ -2838,8 +3371,11 @@ msgstr "  -d, --repeated              skriv kun gentagede beskeder\n"
 
 #: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                skriv kun unikke beskeder, gentagede fjernes\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                skriv kun unikke beskeder, gentagede fjernes\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -2897,35 +3433,35 @@ msgstr ""
 "Tegns�t mangler i hoved.\n"
 "Tekstkonvertering til brugers tegns�t vil ikke virke.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inkonsistent brug af #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:241
 #, fuzzy, c-format
 #| msgid "missing `msgstr[]' section"
 msgid "missing 'msgstr[]' section"
 msgstr "'msgstr[]'-afsnit mangler"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:250
 #, fuzzy, c-format
 #| msgid "missing `msgid_plural' section"
 msgid "missing 'msgid_plural' section"
 msgstr "'msgstr_plural'-afsnit mangler"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:258
 #, fuzzy, c-format
 #| msgid "missing `msgstr' section"
 msgid "missing 'msgstr' section"
 msgstr "'msgstr'-afsnit mangler"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "f�rste flertalsform har indeks, der ikke er nul"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertalsform har forkert indeks"
@@ -2935,7 +3471,7 @@ msgstr "flertalsform har forkert indeks"
 msgid "too many errors, aborting"
 msgstr "afbryder k�rslen p� grund af for mange fejl"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
@@ -2945,54 +3481,76 @@ msgstr "Ugyldig multibytesekvens"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Ugyldig multibytesekvens ved slutning p� fil"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "Ugyldig multibytesekvens ved slutning p� linje"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv-fejl"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ukendt n�gleord '%s'"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ugyldig kontrolsekvens"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "tekststreng ikke afsluttet da filens slutning blev n�et"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linjeskift"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontekstseparator <EOT> inde i streng"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil m� ikke indeholde 'domain'-kommandoer"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "tekst erkl�ret mere end en gang"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "dette er placeringen af den f�rste erkl�ring"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:177 src/read-mo.c:205
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "invalid non-blank character"
+msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "filternavn mangler"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "ugyldig nplurals-v�rdi"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen '%s' er afkortet"
@@ -3002,20 +3560,38 @@ msgstr "filen '%s' er afkortet"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/read-mo.c:169 src/read-mo.c:280
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen '%s' er ikke i GNU .mo-format"
 
-#: src/read-mo.c:183
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "advarsel: ugyldig \\uxxxx-syntaks for ISO 10646-tegn"
 
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: advarsel: ensom surrogat U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "advarsel: streng ikke afsluttet"
@@ -3028,7 +3604,7 @@ msgstr "advarsel: syntaksfejl"
 msgid "warning: unterminated key/value pair"
 msgstr "advarsel: uafsluttet n�gke/v�rdi-par"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr "advarsel: syntaksfejl, ';' forventedes efter streng"
 
@@ -3036,7 +3612,7 @@ msgstr "advarsel: syntaksfejl, ';' forventedes efter streng"
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "advarsel: syntaksfejl, '=' eller ';' forventedes efter streng"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Skrevet af %s og %s.\n"
@@ -3045,16 +3621,16 @@ msgstr "Skrevet af %s og %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Omkod serbisk tekst fra kyrillisk til latinsk kodning.\n"
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3063,27 +3639,27 @@ msgstr ""
 "Inddatateksten l�ses fra standard ind. Den konverterede tekst skrives til\n"
 "standard ud.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "inddata er ikke gyldig i indkodningen '%s'"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved konvertering fra '%s' indkodning til '%s' indkodning"
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "forventede to argumenter"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Brug: %s [TILVALG] URL FIL\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3092,103 +3668,127 @@ 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:228
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: src/urlget.c:234
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "fejl ved skrivning af standard-uddata"
 
-#: src/urlget.c:238
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fejl efter l�sning af '%s'"
 
-#: src/urlget.c:264
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Henter %s..."
 
-#: src/urlget.c:308
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " tiden udl�b.\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " mislykkedes.\n"
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det angivne resultatformat. Fors�g at bruge PO-filsyntaks i stedet."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det "
+"angivne resultatformat. Fors�g at bruge PO-filsyntaks i stedet."
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det angivne resultatformat."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Kan ikke udskrive flere overs�ttelsesdom�ner til en enkelt fil med det "
+"angivne resultatformat."
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "beskedkatalog har sammenh�ngsafh�ngige overs�ttelser, men uddata-formatet underst�tter dem ikke."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"beskedkatalog har sammenh�ngsafh�ngige overs�ttelser, men uddata-formatet "
+"underst�tter dem ikke."
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
-"meddelelsekatalog har overs�ttelser med flertalsformer, men resultatformatet\n"
-"underst�tter dem ikke. Fors�g at generere en Java-klasse med 'msgfmt --java'\n"
+"meddelelsekatalog har overs�ttelser med flertalsformer, men "
+"resultatformatet\n"
+"underst�tter dem ikke. Fors�g at generere en Java-klasse med 'msgfmt --"
+"java'\n"
 "i stedet for en 'properties'-fil."
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "beskedkatalog har overs�ttelser med flertalsformer, men uddata-formatet underst�tter dem ikke."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"beskedkatalog har overs�ttelser med flertalsformer, men uddata-formatet "
+"underst�tter dem ikke."
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standard-uddata"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kunne ikke oprette katalog '%s'"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "overs�ttelse af C?-klasse mislykkedes, pr�v gerne --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "overs�ttelse af C#-klasse mislykkedes"
 
-#: src/write-java.c:1091
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "fejl opst�et ved skrive-�bning af '%s'"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
+"$JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "overs�ttelse af Java-klasse mislykkedes, pr�v gerne at s�tte $JAVAC"
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "fejl opst�et ved skrive-�bning af '%s'"
-
 #: src/write-po.c:821
 #, fuzzy
 #| msgid "invalid multibyte sequence"
@@ -3197,11 +3797,13 @@ msgstr "Ugyldig multibytesekvens"
 
 #: src/write-po.c:884
 #, fuzzy, c-format
-#| msgid "internationalized messages should not contain the `\\%c' escape sequence"
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "overs�ttelige tekster m� ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3214,7 +3816,7 @@ msgstr ""
 "som er et andet end dit. Fors�g at bruge en ren ASCII-msgctxt i stedet.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3227,7 +3829,7 @@ msgstr ""
 "som er et andet end dit. Fors�g at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3235,9 +3837,10 @@ msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
 "men Qt-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
@@ -3245,7 +3848,7 @@ msgstr ""
 "men formatet for meddelelsekataloger i Qt underst�tter kun UCS i de\n"
 "oversatte strengen, ikke i kontekststrengene.\n"
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3255,12 +3858,12 @@ msgstr ""
 "men formatet for meddelelsekataloger i Qt underst�tter kun UCS i de\n"
 "oversatte strenge, ikke i de uoversatta strenge\n"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "fejl ved skrivning til underproces '%s'"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3268,7 +3871,7 @@ msgstr ""
 "beskedkatalog har sammenh�ngsafh�ngige overs�ttelser,\n"
 "men C#-formatet for ressourcer underst�tter ikke sammenh�ng\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3276,7 +3879,7 @@ msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
 "men C#-formatet for ressourcer underst�tter ikke flertalsformer\n"
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3284,7 +3887,7 @@ msgstr ""
 "beskedkatalog har sammenh�ngsafh�ngige overs�ttelser,\n"
 "men Tcl-formatet for beskedskataloger underst�tter ikke sammenh�nge\n"
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3292,33 +3895,52 @@ msgstr ""
 "beskedkatalog har overs�ttelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger underst�tter ikke flertalsformer\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regul�rt udtryk ikke afsluttet"
 
-#: src/x-c.c:1052
-#, fuzzy, c-format
-#| msgid "%s:%d: warning: invalid Unicode character"
-msgid "warning: invalid Unicode character"
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
 
-#: src/x-c.c:1344 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1390 src/x-c.c:1430 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Angiv venligst indkodning af kildetekst via --from-code."
 
@@ -3358,7 +3980,7 @@ msgstr ""
 "%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� linje.\n"
 "Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-fejl"
@@ -3372,56 +3994,424 @@ msgstr ""
 "%s:%d: Ugyldig multibyte-sekvens.\n"
 "Angiv venligst indkodning af kildetekst via --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:2018 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: advarsel: ')' blev fundet hvor '}' forventedes"
 
-#: src/x-csharp.c:2052 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: advarsel: '}' blev fundet hvor ')' forventedes"
 
-#: src/x-glade.c:295
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+
+#: src/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "ukendt sprog '%s'"
+
+#: src/xgettext.c:646
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/x-glade.c:417
+#: src/xgettext.c:701
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
+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/x-glade.c:572 src/x-glade.c:579
+#: src/xgettext.c:705
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext kan ikke arbejde uden nogen n�gleord at kigge efter"
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
 
-#: src/x-glade.c:606
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"Sproget 'glade' er ikke underst�ttet. %s bygger p� expat,\n"
-"Denne version er bygget uden expat.\n"
 
-#: src/x-java.c:494
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:1027
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: advarsel: ensom surrogat U+%04X"
+msgid "Extract translatable strings from given input files.\n"
+msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
+
+#: src/xgettext.c:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
+
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
+
+#: src/xgettext.c:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr "  -p, --output-dir=KATALOG    udfiler placeres i kataloget KATALOG\n"
+
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Valg af sprog for indfil\n"
+
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=NAVN         genkend det angivne sprog\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++                   kort skrivem�de for --language=C++\n"
+
+#: src/xgettext.c:1070
+#, c-format
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr "Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=NAVN        kodning af inddatafiler\n"
+"                                (undtagen for Python, Tcl, Glade)\n"
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr "Som standard antages inddatafilerne at v�re i ASCII.\n"
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr ""
+"  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
+
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr "  -x, --exclude-file=FIL.po   linjer fra FIL tages ikke ud\n"
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cM�RKE, --add-comments=M�RKE  skriv kommentarsblokke som begynder med "
+"M�RKE\n"
+"                                 og foreg�ende n�gleordslinjer til "
+"resultatfilen\n"
+"  -c, --add-comments             skriv alle kommentarsblokke f�r "
+"n�gleordslinjer\n"
+"                                 til resultatfilen\n"
+
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Sprogspecifikke valg:\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           uddrag alle strenge\n"
+
+#: src/xgettext.c:1105
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+
+#: src/xgettext.c:1113
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=ORD:NR:FLAG      ekstra FLAG for strenge inde i argument\n"
+"                              nummer NR for n�gleord ORD\n"
+
+#: src/xgettext.c:1121
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-"
+#| "source)\n"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
+"  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
 
-#: src/x-javascript.c:230
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=FIL        l�s liste af indfiler fra FIL\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (kun sproget C++)\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    genkend Qt-formatstrenge\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (kun sproget C++)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 genkend Boost-formatstrenge\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 mere detaljeret genkendelse af formatstrenge\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
+
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --indent                lav indrykningsst�l i resultatet\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr "      --copyright-holder=STRENG  s�t copyrightindehaver i resultatet\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr "      --foreign-user          udelad FSF-copyrighttekst i resultatet\n"
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PAKKE    s�t pakkenavn i uddata\n"
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSION  s�t pakkeversion i uddata\n"
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EPOST@ADRESSE  s�t modtager for msgid-"
+"fejlrapporter\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG "
+"eller \"\"\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG "
+"eller \"\"\n"
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Et '--flag'-argument har ikke <n�gleord>:<nummer>:[pass-]<flag> syntaks: %s"
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "standard-inddata"
+
+#: src/xgettext.c:1872
+#, fuzzy
+#| msgid ""
+#| "The option --msgid-bugs-address was not specified.\n"
+#| "If you are using a `Makevars' file, please specify\n"
+#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+#| "specify an --msgid-bugs-address command line option.\n"
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Tilvalget --msgid-bugs-address blev ikke angivet.\n"
+"Hvis du bruger en 'Makevars'-fil, s� angiv venligst\n"
+"variablen MSGID_BUGS_ADDRESS d�r; ellers angiv\n"
+"tilvalget --msgid-bugs-address p� kommandolinjen.\n"
+
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "ukendt sprog '%s'"
+
+#: src/x-javascript.c:231
 #, fuzzy
 #| msgid "Please specify the source encoding through --from-code."
 msgid "Please specify the source encoding through --from-code\n"
@@ -3487,523 +4477,445 @@ msgstr ""
 "%s:%d: Ugyldig multibyte-sekvens.\n"
 "Angiv venligst indkodning af kildetekst via --from-code.\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:919
 #, fuzzy, c-format
 #| msgid "%s:%d: warning: unterminated string literal"
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-javascript.c:1055
+#: src/x-javascript.c:1027
 #, fuzzy, c-format
 #| msgid "%s:%d: warning: invalid Unicode character"
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
 
-#: src/x-javascript.c:1069
+#: src/x-javascript.c:1041
 #, fuzzy, c-format
 #| msgid "%s:%d: warning: unterminated string"
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: finder ikke strengafslutningen '%s' nogetsteds f�r filslut"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: h�jre kr�lleparentes mangler i \\x{HEXNUMMER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ugyldig sekvens ('\\l') for 8bit-tegnet '%c'"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ugyldig sekvens ('\\u') for 8bit-tegnet '%c'"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ugyldig variabel-interpolation ved '%c'"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ugyldig interpolation ('\\L') for 8bit-tegnet '%c'"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ugyldig interpolation ('\\U') for 8bit-tegnet '%c'"
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Angiv kildeindkodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ugyldig multibytesekvens.\n"
 "Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Lang ufuldst�ndig multibytesekvens.\n"
 "Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ufuldst�ndig multibytesekvens ved filslut.\n"
 "Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ufuldst�ndig multibytesekvens ved linjeslut.\n"
 "Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ugyldig multibytesekvens.\n"
 "Angiv korrekt kildekodning med --from-code eller med en kommentar if�lge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Ukendt kodning '%s'. Forts�tter med ASCII i stedet."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: mangler tal efter #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ugyldigt streng-udtryk"
 
-#: src/x-sh.c:1074
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: advarsel: syntaksen $\"...\" vil fremover blive fjernet af sikkerheds�rsager; brug eval_gettext i stedet"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-vala.c:414
+#: src/x-rst.c:683
 #, fuzzy, c-format
-#| msgid "%s:%d: warning: unterminated string literal"
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/xgettext.c:545
+#: src/x-rst.c:691
 #, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/x-sh.c:1101
 #, 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:653
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext kan ikke arbejde uden nogen n�gleord at kigge efter"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: advarsel: syntaksen $\"...\" vil fremover blive fjernet af "
+"sikkerheds�rsager; brug eval_gettext i stedet"
 
-#: src/xgettext.c:808
+#: src/x-vala.c:616
 #, fuzzy, c-format
-#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
-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:859
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/xgettext.c:882
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<uden navn>"
 
-#: src/xgettext.c:884
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "ugyldig kontrolsekvens"
 
-#: src/xgettext.c:886
-#, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=KATALOG    udfiler placeres i kataloget KATALOG\n"
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/xgettext.c:891
-#, c-format
-msgid "Choice of input file language:\n"
-msgstr "Valg af sprog for indfil\n"
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/xgettext.c:893
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
 #, fuzzy, c-format
-#| msgid ""
-#| "  -L, --language=NAME         recognise the specified language\n"
-#| "                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-#| "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-#| "                                GCC-source, NXStringTable, RST, Glade)\n"
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "ugyldig kontrolsekvens"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
 msgstr ""
-"  -L, --language=NAVN         genkend det angivne sprog\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   kort skrivem�de for --language=C++\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
 
-#: src/xgettext.c:902
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
 
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
+#: libgettextpo/markup.c:599
+msgid "empty"
 msgstr ""
-"      --from-code=NAVN        kodning af inddatafiler\n"
-"                                (undtagen for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "Som standard antages inddatafilerne at v�re i ASCII.\n"
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
 
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "ugyldig byteorden: %s"
 
-#: src/xgettext.c:917
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=FIL.po   linjer fra FIL tages ikke ud\n"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "Ugyldigt argument %s for %s"
 
-#: src/xgettext.c:919
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid ""
-"  -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"
+msgid "missing '%c'"
 msgstr ""
-"  -cM�RKE, --add-comments=M�RKE  skriv kommentarsblokke som begynder med M�RKE\n"
-"                                 og foreg�ende n�gleordslinjer til resultatfilen\n"
-"  -c, --add-comments             skriv alle kommentarsblokke f�r n�gleordslinjer\n"
-"                                 til resultatfilen\n"
 
-#: src/xgettext.c:925
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid "Language specific options:\n"
-msgstr "Sprogspecifikke valg:\n"
+msgid "missing '%c' or '%c'"
+msgstr ""
 
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           uddrag alle strenge\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
-#| msgid ""
-#| "                                (only languages C, C++, ObjectiveC, Shell,\n"
-#| "                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
 msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
-#| msgid ""
-#| "                                (only languages C, C++, ObjectiveC, Shell,\n"
-#| "                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:1475
+msgid "empty document"
 msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:942
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
 msgstr ""
-"      --flag=ORD:NR:FLAG      ekstra FLAG for strenge inde i argument\n"
-"                              nummer NR for n�gleord ORD\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
-#| msgid ""
-#| "                                (only languages C, C++, ObjectiveC, Shell,\n"
-#| "                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-#| "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
 msgstr ""
-"                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
 
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
 
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    genkend Qt-formatstrenge\n"
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "filternavn mangler"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (kun sproget C++)\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
 
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
 
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 genkend Boost-formatstrenge\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
 
-#: src/xgettext.c:966
-#, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 mere detaljeret genkendelse af formatstrenge\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
 
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
 
-#: src/xgettext.c:1006
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRENG  s�t copyrightindehaver i resultatet\n"
+msgid "document ended unexpectedly: %s"
+msgstr ""
 
-#: src/xgettext.c:1008
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          udelad FSF-copyrighttekst i resultatet\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: src/xgettext.c:1010
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PAKKE    s�t pakkenavn i uddata\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ukendt tilvalg '--%s'\n"
 
-#: src/xgettext.c:1012
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  s�t pakkeversion i uddata\n"
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: src/xgettext.c:1014
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EPOST@ADRESSE  s�t modtager for msgid-fejlrapporter\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: tilvalget '-W %s' kr�ver et argument\n"
 
-#: src/xgettext.c:1016
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr "  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG eller \"\"\n"
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/xgettext.c:1019
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr "  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG eller \"\"\n"
+#~ 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/xgettext.c:1840
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Et '--flag'-argument har ikke <n�gleord>:<nummer>:[pass-]<flag> syntaks: %s"
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
 
-#: src/xgettext.c:1965
-msgid "standard input"
-msgstr "standard-inddata"
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Sproget 'glade' er ikke underst�ttet. %s bygger p� expat,\n"
+#~ "Denne version er bygget uden expat.\n"
 
-#: src/xgettext.c:2071
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Ikke-ASCII-tegn ved %s%s."
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Ikke-ASCII-tegn ved %s%s."
 
-#: src/xgettext.c:2075
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ikke-ASCII-kommentar ved eller f�r %s%s."
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Ikke-ASCII-kommentar ved eller f�r %s%s."
 
-#: src/xgettext.c:2080
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Ikke-ASCII-streng ved %s%s."
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Ikke-ASCII-streng ved %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: advarsel: "
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:2189
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "%s er ikke en gyldig formatstreng for %s selvom den bruges i en formatstrengsposition. �rsag: %s\n"
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "%s er ikke en gyldig formatstreng for %s selvom den bruges i en "
+#~ "formatstrengsposition. �rsag: %s\n"
 
-#: src/xgettext.c:2190
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. �rsag: %s\n"
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. "
+#~ "�rsag: %s\n"
 
-#: src/xgettext.c:2221
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"Formatstrengen '%s' med ikke-navngivne argumenter kan ikke overs�ttes fuldt ud:\n"
-"Overs�tteren kan ikke omordne argumenterne.\n"
-"Overvej i stedet at bruge en formatstreng med navngivne argumenter\n"
-"og en mapning i stedet for en liste for argumenter.\n"
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Formatstrengen '%s' med ikke-navngivne argumenter kan ikke overs�ttes "
+#~ "fuldt ud:\n"
+#~ "Overs�tteren kan ikke omordne argumenterne.\n"
+#~ "Overvej i stedet at bruge en formatstreng med navngivne argumenter\n"
+#~ "og en mapning i stedet for en liste for argumenter.\n"
 
-#: src/xgettext.c:2283
-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 ""
-"Tom msgid. Dette er reserveret af GNU gettext:\n"
-"gettext(\"\") returnerer hovedet med metainformation,\n"
-"ikke den tomme streng.\n"
+#~ 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 ""
+#~ "Tom msgid. Dette er reserveret af GNU gettext:\n"
+#~ "gettext(\"\") returnerer hovedet med metainformation,\n"
+#~ "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2979
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "flertydig argumentangivelse for n�gleord '%.*s'"
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "flertydig argumentangivelse for n�gleord '%.*s'"
 
-#: src/xgettext.c:3006
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "advarsel: kontekst mangles for n�gleordet '%.*s'"
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "advarsel: kontekst mangles for n�gleordet '%.*s'"
 
-#: src/xgettext.c:3031
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
 
-#: src/xgettext.c:3052
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "kontekst passer ikke mellem entals- og flertalsformen"
-
-#: src/xgettext.c:3427
-#, fuzzy
-#| msgid ""
-#| "The option --msgid-bugs-address was not specified.\n"
-#| "If you are using a `Makevars' file, please specify\n"
-#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-#| "specify an --msgid-bugs-address command line option.\n"
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"Tilvalget --msgid-bugs-address blev ikke angivet.\n"
-"Hvis du bruger en 'Makevars'-fil, s� angiv venligst\n"
-"variablen MSGID_BUGS_ADDRESS d�r; ellers angiv\n"
-"tilvalget --msgid-bugs-address p� kommandolinjen.\n"
-
-#: src/xgettext.c:3646
-#, fuzzy, c-format
-#| msgid "language `%s' unknown"
-msgid "language '%s' unknown"
-msgstr "ukendt sprog '%s'"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<uden navn>"
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "kontekst passer ikke mellem entals- og flertalsformen"
 
 #~ msgid "header field `%s' should start at beginning of line\n"
 #~ msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 619ed0d29..f0f4bb98b 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -85,7 +85,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-06-26 13:05+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -93,20 +93,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "ungültiges Argument %s für %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "mehrdeutiges Argument %s für %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
@@ -136,154 +137,137 @@ msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "Berechtigungen für %s werden beibehalten"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "Öffnen der Datei %s zum Lesen fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "Öffnen der Sicherungsdatei %s zum Schreiben fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, 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:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232 src/msginit.c:1397
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() fehlgeschlagen"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C#-Compiler nicht gefunden; bitte »pnet« installieren"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: Option „%s“ ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: Option »--%s« erwartet kein Argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unbekannte Option »%c%s«\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unbekannte Option »--%s«\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unbekannte Option »%c%s«\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option »-W %s« erwartet ein Argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ungültiges Argument source_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ungültiges Argument target_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen von »%s«"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-java.c:1157 src/write-java.c:1198
-#: src/write-mo.c:812 src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen"
+msgstr ""
+"Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
@@ -292,49 +276,48 @@ msgstr ""
 "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
 "$JAVA setzen"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141 src/msginit.c:1405
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Subprozess %s mit Ein-/Ausgabefehler"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/format-kde-kuit.c:239 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 src/x-glade.c:549
-#: libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Speicher aufgebraucht"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "Erstellung der Threads fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "Lesen vom Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 "es ist nicht möglich, eine nicht-blockierende Ein/Ausgabe zum Subprozess %s\n"
 "zu setzen"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "Subprozess %s wurde mit dem Exit-Code %d beendet"
@@ -358,13 +341,13 @@ msgstr "Subprozess %s wurde mit dem Exit-Code %d beendet"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "«"
 
@@ -373,134 +356,317 @@ msgstr "«"
 msgid "setting permissions for %s"
 msgstr "Festlegung der Berechtigungen für %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "Es ist nicht möglich, eine Pipe einzurichten"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fehlgeschlagen"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "Dateideskriptor %d kann nicht wiederhergestellt werden: dup2 scheiterte"
+msgstr ""
+"Dateideskriptor %d kann nicht wiederhergestellt werden: dup2 scheiterte"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "Subprozess %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Subprozess %s hat das fatale Signal %d erhalten"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217 src/xgettext.c:2036
-#: src/xgettext.c:2049 src/xgettext.c:2059
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:152
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "im Gegensatz zu »%3$s« ist »%1$s« kein gültiges %2$s Format-Element. Der Grund ist: %4$s"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, fuzzy, c-format
+#| msgid "The root element <%s> is not allowed in a valid Glade file"
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "Das Root-Element <%s> ist in einer Glade-Datei nicht zulässig"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "»%s --help« gibt weitere Informationen.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Aufruf: %s [OPTION] [DATEI]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
+"notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
+"\n"
+"Für die deutsche Übersetzung sind die Übersetzer der Mailingliste\n"
+"<translation-team-de@lists.sourceforge.net> zuständig.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Lizenz GPLv3: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl.html>\n"
+"\n"
+"Dies ist freie Software; es steht Ihnen frei, sie zu verändern und\n"
+"weiterzugeben.\n"
+"Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Geschrieben von %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, fuzzy, c-format
+#| msgid "%s exists but cannot read"
+msgid "%s cannot be read"
+msgstr "%s existiert, aber kann nicht gelesen werden"
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
 msgstr "eine Formatspezifikation für Argument %u, wie in »%s«, fehlt in »%s«"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "eine Formatspezifikation für Argument »%u« fehlt in »%s«"
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "Formatspezifikation in »%s« und »%s« für Argument %u sind nicht identisch"
+msgstr ""
+"Formatspezifikation in »%s« und »%s« für Argument %u sind nicht identisch"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Die %u. Formatanweisung beginnt mit |, aber endet nicht mit |."
 
-#: src/format-c.c:37
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"im Gegensatz zu »%3$s« ist »%1$s« kein gültiges %2$s Format-Element. Der "
+"Grund ist: %4$s"
+
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "In der %u. Formatanweisung ist das Wort nach »<« nicht der Name eines Makros einer Formatspezifikation. Die gültigen Makronamen sind in ISO C 99 Abschnitt 7.8.1 aufgeführt."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"In der %u. Formatanweisung ist das Wort nach »<« nicht der Name eines Makros "
+"einer Formatspezifikation. Die gültigen Makronamen sind in ISO C 99 "
+"Abschnitt 7.8.1 aufgeführt."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "In der %u. Formatanweisung folgt dem Wort nach »<« kein »>«."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Die Zeichenkette bezieht sich auf das %u. Argument, ignoriert aber das %u. Argument."
+msgstr ""
+"Die Zeichenkette bezieht sich auf das %u. Argument, ignoriert aber das %u. "
+"Argument."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "die Anzahl der Formatspezifikationen in »%s« und »%s« stimmt nicht überein"
+msgstr ""
+"die Anzahl der Formatspezifikationen in »%s« und »%s« stimmt nicht überein"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "In der %u. Formatanweisung folgt der »{« kein nummeriertes Argument."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "In der %u. Formatanweisung folgt dem »,« keine Zahl."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Die Zeichenkette endet mitten in einer Anweisung: »{« ohne übereinstimmende »}« gefunden."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Die Zeichenkette endet mitten in einer Anweisung: »{« ohne übereinstimmende "
+"»}« gefunden."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "Die %u. Formatanweisung endet mit dem ungültigen Zeichen »%c« anstatt einer\n"
 "»}«."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer »}«."
+msgstr ""
+"Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer »}«."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Die Zeichenkette beginnt mitten in einer Anweisung: »}« ohne übereinstimmende »{« gefunden."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Die Zeichenkette beginnt mitten in einer Anweisung: »}« ohne "
+"übereinstimmende »{« gefunden."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Die Zeichenkette beinhaltet eine einzelne »}« nach der %u. Formatanweisung."
+msgstr ""
+"Die Zeichenkette beinhaltet eine einzelne »}« nach der %u. Formatanweisung."
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -510,17 +676,26 @@ msgstr "In der %u. Formatanweisung ist die Kombination der Flags ungültig."
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
+msgstr ""
+"In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
 
 #: 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 "In der %u. Formatanweisung muss die Argumentzahl für die Genauigkeit gleich sein mit %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"In der %u. Formatanweisung muss die Argumentzahl für die Genauigkeit gleich "
+"sein mit %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "In der %u. Formatanweisung ist eine Genauigkeitsspezifikation vor »%c« nicht erlaubt."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"In der %u. Formatanweisung ist eine Genauigkeitsspezifikation vor »%c« nicht "
+"erlaubt."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -557,95 +732,145 @@ msgid "The string ends in the middle of a directive."
 msgstr "Die Zeichenkette endet mitten in einer Formatanweisung."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Die Zeichenkette bezieht sich auf Argumente mittels absoluter Nummerierung der Argumente und mittels nicht nummerierter Argumentspezifikationen."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Die Zeichenkette bezieht sich auf Argumente mittels absoluter Nummerierung "
+"der Argumente und mittels nicht nummerierter Argumentspezifikationen."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "In der %u. Formatanweisung ist das 0. Argument keine positive Ganzzahl."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"In der %u. Formatanweisung ist das 0. Argument keine positive Ganzzahl."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "In der %u. Formatanweisung ist das 0. Argument für die Breite keine positive Ganzzahl."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"In der %u. Formatanweisung ist das 0. Argument für die Breite keine positive "
+"Ganzzahl."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "In der %u. Formatanweisung ist das 0. Genauigkeitsargument keine positive Ganzzahl."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"In der %u. Formatanweisung ist das 0. Genauigkeitsargument keine positive "
+"Ganzzahl."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "In der %u. Formatanweisung ist das Zeichen »%c« keine gültige Konvertierspezifikation."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"In der %u. Formatanweisung ist das Zeichen »%c« keine gültige "
+"Konvertierspezifikation."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine gültige Konvertierspezifikation."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Das Zeichen, das die %u. Formatanweisung terminiert, ist keine gültige "
+"Konvertierspezifikation."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Die Zeichenkette bezieht sich auf das %u. Argument in einer nicht kompatiblen Weise."
+msgstr ""
+"Die Zeichenkette bezieht sich auf das %u. Argument in einer nicht "
+"kompatiblen Weise."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger Datums- bzw. Zeitstil."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger "
+"Datums- bzw. Zeitstil."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "In der %u. Formatanweisung folgt dem »%s« kein Komma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger Zahlenstil."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger "
+"Zahlenstil."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "In der %u. Formatanweisung folgt dem nummerierten Argument kein Komma und keins von »%s«, »%s«, »%s«, »%s«."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"In der %u. Formatanweisung folgt dem nummerierten Argument kein Komma und "
+"keins von »%s«, »%s«, »%s«, »%s«."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "In der %u. Formatanweisung beinhaltet eine Auswahl keine Zahl."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "In der %u. Formatanweisung beinhaltet eine Auswahl eine Zahl, der weder »<«, »#« noch »%s« folgt."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"In der %u. Formatanweisung beinhaltet eine Auswahl eine Zahl, der weder »<«, "
+"»#« noch »%s« folgt."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument {%u}, wie in »%s«, fehlt in »%s«"
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument {%u} fehlt in »%s«"
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "Formatspezifikationen in »%s« und »%s« für Argument {%u} sind nicht identisch"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"Formatspezifikationen in »%s« und »%s« für Argument {%u} sind nicht identisch"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Die Zeichenkette bezieht sich auf Argunment %u, ignoriert aber die Argumente %u und %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Die Zeichenkette bezieht sich auf Argunment %u, ignoriert aber die Argumente "
+"%u und %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "eine Formatspezifikation für die Argumente %u und %u fehlt in „%s“ aber nur ein Argument darf ignoriert werden"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"eine Formatspezifikation für die Argumente %u und %u fehlt in „%s“ aber nur "
+"ein Argument darf ignoriert werden"
 
-#: src/format-kde-kuit.c:251 src/format-kde-kuit.c:261
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
 msgid "error while parsing: %s"
 msgstr "Fehler beim Lesen: »%s«"
@@ -653,15 +878,27 @@ msgstr "Fehler beim Lesen: »%s«"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "In der %u. Formatanweisung ist der %u. Parameter vom Typ »%s«, aber es wird ein Parameter vom Typ »%s« erwartet."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"In der %u. Formatanweisung ist der %u. Parameter vom Typ »%s«, aber es wird "
+"ein Parameter vom Typ »%s« erwartet."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "In der %u. Formatanweisung sind zu viele Parameter angegeben; es wird höchstens %u Parameter erwartet."
-msgstr[1] "In der %u. Formatanweisung sind zu viele Parameter angegeben; es werden höchstens %u Parameter erwartet."
+msgid ""
+"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."
+msgstr[0] ""
+"In der %u. Formatanweisung sind zu viele Parameter angegeben; es wird "
+"höchstens %u Parameter erwartet."
+msgstr[1] ""
+"In der %u. Formatanweisung sind zu viele Parameter angegeben; es werden "
+"höchstens %u Parameter erwartet."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -692,17 +929,23 @@ msgstr "In der %u. Formatanweisung sind die beiden Modifier @ und : angegeben."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "In der %u. Formatanweisung folgen dem »~:[« keine zwei Clausen, abgetrennt durch »~;«."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"In der %u. Formatanweisung folgen dem »~:[« keine zwei Clausen, abgetrennt "
+"durch »~;«."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "In der %u. Formatanweisung wird »~;« an einer ungültigen Stelle verwendet."
+msgstr ""
+"In der %u. Formatanweisung wird »~;« an einer ungültigen Stelle verwendet."
 
 #: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Die Zeichenkette bezieht sich in nicht kompatibler Weise auf ein Argument."
+msgstr ""
+"Die Zeichenkette bezieht sich in nicht kompatibler Weise auf ein Argument."
 
 #: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
@@ -712,262 +955,306 @@ msgstr "die Formatspezifikationen in »%s« und »%s« sind nicht gleichbedeuten
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "die Formatspezifikationen in »%s« sind keine Untermenge von denen in »%s«"
-
-#: src/format-perl.c:434
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "In der %u. Formatanweisung ist die Größenspezifikation mit der Konvertierungsspezifikation »%c« nicht kompatibel."
+msgstr ""
+"die Formatspezifikationen in »%s« sind keine Untermenge von denen in »%s«"
 
-#: src/format-perl-brace.c:199 src/format-python.c:472
-#: src/format-python-brace.c:435 src/format-python-brace.c:448
-#: src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "eine Formatspezifikation für Argument »%s« fehlt in »%s«"
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Die Zeichenkette bezieht sich auf Argumente mit bezeichneten Argumenten und mit unbezeichneten Argumentspezifikationen."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"In der %u. Formatanweisung ist die Größenspezifikation mit der "
+"Konvertierungsspezifikation »%c« nicht kompatibel."
 
-#: src/format-python.c:355
+#: src/format-python-brace.c:138
 #, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Die Zeichenkette bezieht sich in nicht kompatibler Weise auf das bezeichnete Argument »%s«."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+"In der %u. Formatanweisung darf »%c« nicht mit einem Feldnamen beginnen."
 
-# CHECKIT
-#: src/format-python.c:431
+#: src/format-python-brace.c:157
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "Formatspezifikationen in »%s« erwarten ein Mapping, die in »%s« jedoch ein Tupel"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"In der %u. Formatanweisung darf »%c« nicht mit einem getattr-Argument "
+"beginnen."
 
-#: src/format-python.c:438
+#: src/format-python-brace.c:171
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
-"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch ein\n"
-"Mapping"
+"In der %u. Formatanweisung darf »%c« nicht mit einem getitem-Argument "
+"beginnen."
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python-brace.c:193
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »%s«"
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"In der %u. Formatanweisung ist in einem Formatbezeichner keine weitere "
+"Verschachtelung erlaubt."
 
-#: src/format-python.c:495
+#: src/format-python-brace.c:278
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "Formatspezifikationen in »%s« und »%s« für Argument »%s« stimmen nicht überein"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+"In der %u. Formatanweisung gibt es eine nicht terminierte Formatanweisung."
 
-#: src/format-python-brace.c:138
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Die Zeichenkette bezieht sich auf Argumente mit bezeichneten Argumenten und "
+"mit unbezeichneten Argumentspezifikationen."
+
+#: src/format-python.c:354
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem Feldnamen beginnen."
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr ""
+"Die Zeichenkette bezieht sich in nicht kompatibler Weise auf das bezeichnete "
+"Argument »%s«."
 
-#: src/format-python-brace.c:151
+# CHECKIT
+#: src/format-python.c:430
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem getattr-Argument beginnen."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"Formatspezifikationen in »%s« erwarten ein Mapping, die in »%s« jedoch ein "
+"Tupel"
 
-#: src/format-python-brace.c:166
+#: src/format-python.c:437
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem getitem-Argument beginnen."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch "
+"ein\n"
+"Mapping"
 
-#: src/format-python-brace.c:186
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "In der %u. Formatanweisung ist in einem Formatbezeichner keine weitere Verschachtelung erlaubt."
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr "eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »%s«"
 
-#: src/format-python-brace.c:271
+#: src/format-python.c:494
 #, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "In der %u. Formatanweisung gibt es eine nicht terminierte Formatanweisung."
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"Formatspezifikationen in »%s« und »%s« für Argument »%s« stimmen nicht "
+"überein"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "»%s« ist ein einfaches Formatelement, aber »%s« ist es nicht: es enthält ein »L«-Flag oder eine doppelstellige Argumentenanzahl"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"»%s« ist ein einfaches Formatelement, aber »%s« ist es nicht: es enthält ein "
+"»L«-Flag oder eine doppelstellige Argumentenanzahl"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, der nicht ASCII-kodiert ist."
+msgstr ""
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, der "
+"nicht ASCII-kodiert ist."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Die Zeichenkette bezieht sich auf eine Shell-Variable mit komplexer Shellklammernsyntax. Diese Syntax wird hier aus Sicherheitsgründen nicht unterstützt."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit komplexer "
+"Shellklammernsyntax. Diese Syntax wird hier aus Sicherheitsgründen nicht "
+"unterstützt."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Die Zeichenkette bezieht sich auf eine Shell-Variable, deren Wert innerhalb einer Shellfunktion unterschiedlich sein kann."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Die Zeichenkette bezieht sich auf eine Shell-Variable, deren Wert innerhalb "
+"einer Shellfunktion unterschiedlich sein kann."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem leeren Namen."
-
-#: src/format-ycp.c:91
-#, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen 1 und 9."
+msgstr ""
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem leeren Namen."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:90
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer zwischen 1 und 9."
-
-#: src/hostname.c:181 src/msgattrib.c:356 src/msgcat.c:295 src/msgcmp.c:173
-#: src/msgcomm.c:286 src/msgconv.c:245 src/msgen.c:242 src/msgexec.c:187
-#: src/msgfilter.c:289 src/msgfmt.c:417 src/msggrep.c:420 src/msginit.c:269
-#: src/msgmerge.c:357 src/msgunfmt.c:263 src/msguniq.c:265
-#: src/recode-sr-latin.c:111 src/urlget.c:144 src/xgettext.c:646
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Lizenz GPLv3: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl.html>\n"
-"\n"
-"Dies ist freie Software; es steht Ihnen frei, sie zu verändern und\n"
-"weiterzugeben.\n"
-"Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
+"In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen 1 und "
+"9."
 
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgcmp.c:179
-#: src/msgcomm.c:292 src/msgconv.c:251 src/msgen.c:248 src/msgexec.c:193
-#: src/msgfilter.c:295 src/msgfmt.c:423 src/msggrep.c:426 src/msginit.c:275
-#: src/msgmerge.c:363 src/msgunfmt.c:269 src/msguniq.c:271 src/urlget.c:150
-#: src/xgettext.c:652
+#: src/format-ycp.c:91
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Geschrieben von %s.\n"
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
+"zwischen 1 und 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/hostname.c:210 src/msgattrib.c:418 src/msgcat.c:364 src/msgcmp.c:210
-#: src/msgcomm.c:356 src/msgconv.c:304 src/msgen.c:301 src/msgexec.c:260
-#: src/msgfilter.c:410 src/msgfmt.c:771 src/msggrep.c:513 src/msginit.c:359
-#: src/msgmerge.c:495 src/msgunfmt.c:424 src/msguniq.c:323
-#: src/recode-sr-latin.c:144 src/urlget.c:173 src/xgettext.c:900
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "»%s --help« gibt weitere Informationen.\n"
-
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Aufruf: %s [OPTION]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Rechnernamen (Hostname) ausgeben.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format der Ausgabe:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           kurzer Rechnername\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long    langer Rechnername, einschließlich des\n"
 "                          vollqualifizierten Domainnamen (FQDN) und Aliasse\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:917 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1080
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/hostname.c:233 src/msgattrib.c:537 src/msgcat.c:472 src/msgcmp.c:261
-#: src/msgcomm.c:458 src/msgconv.c:388 src/msgen.c:384 src/msgexec.c:309
-#: src/msgfilter.c:510 src/msgfmt.c:919 src/msggrep.c:631 src/msginit.c:423
-#: src/msgmerge.c:622 src/msgunfmt.c:530 src/msguniq.c:420
-#: src/recode-sr-latin.c:165 src/urlget.c:189 src/xgettext.c:1082
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "es ist nicht möglich, den Rechnernamen (Hostname) zu ermitteln"
 
-#: src/hostname.c:235 src/msgattrib.c:539 src/msgcat.c:474 src/msgcmp.c:263
-#: src/msgcomm.c:460 src/msgconv.c:390 src/msgen.c:386 src/msgexec.c:311
-#: src/msgfilter.c:512 src/msgfmt.c:921 src/msggrep.c:633 src/msginit.c:425
-#: src/msgmerge.c:624 src/msgunfmt.c:532 src/msguniq.c:422
-#: src/recode-sr-latin.c:168 src/urlget.c:191 src/xgettext.c:1084
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "es müssen mindestens zwei Dateien angegeben werden"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:242 src/msgattrib.c:546 src/msgcat.c:481 src/msgcmp.c:270
-#: src/msgcomm.c:467 src/msgconv.c:397 src/msgen.c:393 src/msgexec.c:318
-#: src/msgfilter.c:519 src/msgfmt.c:932 src/msggrep.c:640 src/msginit.c:432
-#: src/msgmerge.c:635 src/msgunfmt.c:541 src/msguniq.c:429
-#: src/recode-sr-latin.c:175 src/urlget.c:200 src/xgettext.c:1091
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "Es ist nicht möglich, eine Pipe einzurichten"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
-"Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
-"\n"
-"Für die deutsche Übersetzung sind die Übersetzer der Mailingliste\n"
-"<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/its.c:695
 #, c-format
-msgid "could not get host name"
-msgstr "es ist nicht möglich, den Rechnernamen (Hostname) zu ermitteln"
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "ungültiges Argument %s für %s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "Es ist nicht möglich, eine Pipe einzurichten"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, fuzzy, c-format
+#| msgid "%s does not exist"
+msgid "\"%s\" node does not have \"%s\""
+msgstr "%s existiert nicht"
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "höchstens eine Eingabedatei erlaubt"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:471 src/msgfmt.c:479
-#: src/msgfmt.c:494 src/msgfmt.c:516 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:662 src/xgettext.c:669 src/xgettext.c:672
-#: src/xgettext.c:675
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -976,305 +1263,353 @@ msgstr ""
 "Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n"
 "Attribute der Meldungen bearbeiten.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:789 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:918
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:793 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:924
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, 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"
+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:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:815 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:929
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:817 src/msgfmt.c:866
-#: src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492 src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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"
+msgstr ""
+"  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n"
+"Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei "
+"oder\n"
 "»-« angegeben ist.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Auswahl der Meldungen:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            übersetzte übernehmen, unübersetzte verwerfen\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            übersetzte übernehmen, unübersetzte verwerfen\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          unübersetzte übernehmen, übersetzte verwerfen\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          unübersetzte übernehmen, übersetzte verwerfen\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              mit »fuzzy« markierte verwerfen\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            mit »fuzzy« markierte übernehmen\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           obsolete Meldungen (#~) verwerfen\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         obsolete Meldungen (#~) übernehmen\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute verändern:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             alle Meldungen auf »fuzzy« setzen\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           »fuzzy«-Markierung von allen Meldungen entfernen\n"
+msgstr ""
+"      --clear-fuzzy           »fuzzy«-Markierung von allen Meldungen "
+"entfernen\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          alle Meldungen obsolet machen\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        alle Meldungen nicht-obsolet machen\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              wenn auf »fuzzy« gesetzt, die vorherigen Schlüssel\n"
+"      --previous              wenn auf »fuzzy« gesetzt, die vorherigen "
+"Schlüssel\n"
 "                               der übersetzten Meldungen beibehalten\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        »previous msgid« von allen Meldungen entfernen\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        »previous msgid« von allen Meldungen "
+"entfernen\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
 "      --empty                 beim Entfernen der »fuzzy«-Markierung auch\n"
 "                                »msgstr« leeren\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=DATEI.po   nur die Einträge  manipulieren, die in DATEI.po\n"
+"      --only-file=DATEI.po   nur die Einträge  manipulieren, die in DATEI."
+"po\n"
 "                                 gelistet sind\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=DATEI.po  nur die Einträge  manipulieren, die in DATEI.po\n"
+"      --ignore-file=DATEI.po  nur die Einträge  manipulieren, die in DATEI."
+"po\n"
 "                                 nicht gelistet sind\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 Synonym für »--only-fuzzy --clear-fuzzy«\n"
+msgstr ""
+"      --fuzzy                 Synonym für »--only-fuzzy --clear-fuzzy«\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              Synonym für »--only-obsolete --clear-obsolete«\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              Synonym für »--only-obsolete --clear-"
+"obsolete«\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:879 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax der Eingabedatei:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      Eingabedatei folgt der .properties-Syntax von\n"
 "                                Java\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     Eingabedatei folgt der .strings-Syntax von\n"
 "                                Nextstep/Gnustep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:907 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1026
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1028
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"      --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:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1032
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STILDATEI       CSS-Datei mit Stil-Regel für --color angeben\n"
+msgstr ""
+"      --style=STILDATEI       CSS-Datei mit Stil-Regel für --color angeben\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1034
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             keine C-Escape-Sequenzen in Ausgabe verwenden\n"
 "                              (Vorgabe)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1036
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                C-Escape-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1038
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              PO-Datei erstellen, auch wenn sie leer ist\n"
+msgstr ""
+"      --force-po              PO-Datei erstellen, auch wenn sie leer ist\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1040
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1042
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
+msgstr ""
+"      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht "
+"schreiben\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1044
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          Zeilen mit »#: Datei:Zeilennr.« erhalten (Vorgabe)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          Zeilen mit »#: Datei:Zeilennr.« erhalten "
+"(Vorgabe)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1046
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                .po-Datei streng nach Uniforum-Format erstellen\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                .po-Datei streng nach Uniforum-Format "
+"erstellen\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1050
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    eine ».strings«-Datei von Nextstep/Gnustep\n"
 "                               erstellen\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1052
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=ANZAHL          Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
+msgstr ""
+"  -w, --width=ANZAHL          Breite der Ausgabe auf ANZAHL Spalten "
+"festlegen\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1054
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1284,31 +1619,32 @@ msgstr ""
 "                               Breite der Ausgabe sind, nicht auf mehrere\n"
 "                               Zeilen umbrechen\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1057
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortierte Ausgabe erstellen\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1059
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:904
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1332,23 +1668,24 @@ msgstr ""
 "entsprechende Eintrag nur von der ersten PO-Datei berücksichtigt, in der der\n"
 "Eintrag vorkommt.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:920
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:922
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:795
-#: src/xgettext.c:926
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:409 src/msgcomm.c:400
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1357,7 +1694,7 @@ msgstr ""
 "  -<, --less-than=ANZAHL     Meldungen mit weniger als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: unendlich)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1366,7 +1703,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: 0)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1375,30 +1712,33 @@ msgstr ""
 "  -u, --unique               Abkürzung für »--less-than=2«; Meldungen\n"
 "                             anfordern, die nur einmal vorkommen\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:881
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      Eingabedateien folgen der .properties-Syntax von\n"
+"  -P, --properties-input      Eingabedateien folgen der .properties-Syntax "
+"von\n"
 "                              Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:883
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     Eingabedateien folgen der NeXTstep/GNUstep-Syntax\n"
+"      --stringtable-input     Eingabedateien folgen der NeXTstep/GNUstep-"
+"Syntax\n"
 "                              für .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, 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:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1408,32 +1748,34 @@ msgstr ""
 "                               Meldung verwenden, nicht mehrere\n"
 "                               Übersetzungen zusammenziehen\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=KATALOGNAME      »Language«-Feld in dem Kopfeintrag setzen\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=KATALOGNAME      »Language«-Feld in dem Kopfeintrag setzen\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "keine Eingabedateien angegeben"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "es werden genau zwei Eingabedateien benötigt"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1453,84 +1795,87 @@ msgstr ""
 "Hilfestellung zu geben.\n"
 "\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  Def.po                        Übersetzungen\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  Ref.pot                       Referenzen auf die Quelldateien\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          Ref.pot auf jeden Bereich in Def.po anwenden\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          Ref.pot auf jeden Bereich in Def.po anwenden\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy-Übereinstimmung nicht verwenden\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  --use-fuzzy                 ungenaue Einträge (»fuzzy«) verwenden\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      unübersetzte Einträge verwenden\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "diese Meldung ist unübersetzt"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "diese Meldung muss vom Übersetzer geprüft werden"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...diese Definition ist ähnlich"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "Warnung: diese Meldung kommt nicht vor"
 
-#: src/msgcmp.c:554 src/msgfmt.c:653 src/msgfmt.c:1444 src/xgettext.c:883
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 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:317
+#: 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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1552,7 +1897,7 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1561,71 +1906,79 @@ msgstr ""
 "  ->, --more-than=ANZAHL      Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1061
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header            »msgid \"\"«-Eintrag im Kopfteil nicht erstellen\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header            »msgid \"\"«-Eintrag im Kopfteil nicht "
+"erstellen\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Zielformat der Konvertierung:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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\n"
 "Spracheinstellung.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
+msgstr ""
+"      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht "
+"schreiben\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          Zeilen mit »#: Dateiname:Zeilennr.« erhalten\n"
 "                                  (Vorgabe)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                .po-Datei streng nach Uniforum-Format erstellen\n"
+msgstr ""
+"      --strict                .po-Datei streng nach Uniforum-Format "
+"erstellen\n"
 
-#: src/msgen.c:259 src/msgfmt.c:434 src/xgettext.c:692
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "es wird genau eine Eingabedatei benötigt"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Aufruf: %s [OPTION] EINGABEDATEI\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1638,22 +1991,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:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  EINGABEDATEI                PO- oder POT-Eingabedatei\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "Name des Befehls fehlt"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Aufruf: %s [OPTION] BEFEHL [BEFEHL-OPTION]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1669,7 +2022,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1679,352 +2032,414 @@ msgstr ""
 "von einem Nullbyte-Zeichen.  Die Ausgabe von »msgexec 0« ist geeignet als\n"
 "Eingabe für »xargs -0«.\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Befehlseingabe:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   Zeilenumbruch am Eingabeende hinzufügen\n"
+msgstr ""
+"  --newline                   Zeilenumbruch am Eingabeende hinzufügen\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=EINGABEDATEI    PO-Eingabedatei\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "Schreiben nach Standardausgabe fehlgeschlagen"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "Name des Filters fehlt"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "es muss mindestens ein sed-Skript angegeben werden"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen "
+"anwenden.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, 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 ""
 "Der FILTER kann ein beliebiges Programm sein, das die Übersetzung von der\n"
-"Standardeingabe liest und die geänderte Übersetzung nach der Standardausgabe\n"
+"Standardeingabe liest und die geänderte Übersetzung nach der "
+"Standardausgabe\n"
 "schreibt.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Ein- und Ausgabe filtern:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
-msgstr "  --newline                   am Ende der Eingabe einen Zeilenumbruch hinzufügen                                Einen Zeilenumbruch am Ende der Ausgabe entfernen"
+msgstr ""
+"  --newline                   am Ende der Eingabe einen Zeilenumbruch "
+"hinzufügen                                Einen Zeilenumbruch am Ende der "
+"Ausgabe entfernen"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, 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"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=SKRIPT_DATEI     Inhalt der SKRIPT_DATEI den auszuführenden\n"
 "                                Befehlen hinzufügen\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       »Pattern-Space« nicht automatisch ausgeben\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       »Pattern-Space« nicht automatisch ausgeben\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             keine C-Escape-Sequenzen in Ausgabe\n"
 "                               verwenden (Vorgabe)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                Ausgabe eingerückt darstellen\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           Kopfeintrag unverändert übernehmen, nicht filtern\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           Kopfeintrag unverändert übernehmen, nicht "
+"filtern\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "Die Ausgabe des Filters endet nicht mit einem Zeilenumbruch"
 
-#: src/msgfmt.c:346
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "das Argument für %s sollte ein einzelnes Interpunktionszeichen sein"
 
-#: src/msgfmt.c:393
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ungültiger Endian-Wert: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:423 src/msgunfmt.c:269 src/xgettext.c:652
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:440
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
-msgstr "Wenn %s und %s angegeben sind, sollte keine Eingabedatei angegeben werden"
+msgstr ""
+"Wenn %s und %s angegeben sind, sollte keine Eingabedatei angegeben werden"
 
-#: src/msgfmt.c:485 src/msgfmt.c:507 src/msgfmt.c:529 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:500 src/msgfmt.c:522 src/msgfmt.c:557 src/msgunfmt.c:324
-#: src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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 Spracheinstellung«"
 
-#: src/msgfmt.c:539
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s erfordert eine Angabe in der Art »--template Vorlage«"
 
-#: src/msgfmt.c:546
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-o Datei«"
 
-#: src/msgfmt.c:552
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s und %s schließen sich in %s gegenseitig aus"
 
-#: src/msgfmt.c:566 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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"
 
-#: src/msgfmt.c:572 src/msgfmt.c:578
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s ist nur mit %s, %s oder %s gültig"
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:741
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:745
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d übersetzte Meldung"
 msgstr[1] "%d übersetzte Meldungen"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ungenaue Übersetzung"
 msgstr[1] ", %d ungenaue Übersetzungen"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d unübersetzte Meldung"
 msgstr[1] ", %d unübersetzte Meldungen"
 
-#: src/msgfmt.c:775
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
 
-#: src/msgfmt.c:779
+#: src/msgfmt.c:910
 #, c-format
 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:784 src/xgettext.c:913
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
 msgstr ""
-"Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
-"notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n"
+"Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
 
-#: src/msgfmt.c:791
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:798 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:962
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
 
-#: src/msgfmt.c:800
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
-"  -j, --java                  Java-Modus: eine ResourceBundle-Klasse für Java\n"
+"  -j, --java                  Java-Modus: eine ResourceBundle-Klasse für "
+"Java\n"
 "                               erstellen\n"
 
-#: src/msgfmt.c:802
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 wie --java, aber Java2 (JDK 1.2 oder höher) annehmen\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 wie --java, aber Java2 (JDK 1.2 oder höher) "
+"annehmen\n"
 
-#: src/msgfmt.c:804
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --qt                    C#-Modus: eine .dll-Datei für .NET erstellen\n"
+msgstr ""
+"      --qt                    C#-Modus: eine .dll-Datei für .NET erstellen\n"
 
-#: src/msgfmt.c:806
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      C#-Ressourcenmodus: eine .resources-Datei für\n"
 "                                .NET erstellen\n"
 
-#: src/msgfmt.c:808
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-Modus: eine .msg-Datei für tcl/msgcat erstellen\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-Modus: eine .msg-Datei für tcl/msgcat "
+"erstellen\n"
 
-#: src/msgfmt.c:810
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    Qt-Modus: eine .qm-Datei für Qt erstellen\n"
+msgstr ""
+"      --qt                    Qt-Modus: eine .qm-Datei für Qt erstellen\n"
 
-#: src/msgfmt.c:812
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Desktopeintrag-Modus: erzeugt eine .desktop-Datei\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Desktopeintrag-Modus: erzeugt eine .desktop-"
+"Datei\n"
 
-#: src/msgfmt.c:819
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+"      --qt                    Qt-Modus: eine .qm-Datei für Qt erstellen\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict             Datei streng nach Uniforum-Format erstellen\n"
+msgstr ""
+"      --strict             Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgfmt.c:821 src/xgettext.c:937
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben ist.\n"
+msgstr ""
+"Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
+"ist.\n"
 
-#: src/msgfmt.c:824
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Angaben zu Ausgabedateien im Java-Modus:\n"
 
-#: src/msgfmt.c:826 src/msgfmt.c:842 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:828 src/msgfmt.c:844 src/msgfmt.c:854 src/msgfmt.c:864
-#: src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOKALE         Name der Spracheinstellung, entweder »Sprache«\n"
-"                               (z. B. »de«) oder »Sprache_LAND\" (z. B. »de_DE«)\n"
+"  -l, --locale=LOKALE         Name der Spracheinstellung, entweder "
+"»Sprache«\n"
+"                               (z. B. »de«) oder »Sprache_LAND\" (z. B. "
+"»de_DE«)\n"
 
-#: src/msgfmt.c:830
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                erstellt eine .java-Datei anstelle einer .class-Datei\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                erstellt eine .java-Datei anstelle einer ."
+"class-Datei\n"
 
-#: src/msgfmt.c:832
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d VERZEICHNIS              Basis-Verzeichnis der Verzeichnis-Hierarchie mit\n"
+"  -d VERZEICHNIS              Basis-Verzeichnis der Verzeichnis-Hierarchie "
+"mit\n"
 "                               den Klassen\n"
 
-#: src/msgfmt.c:834
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Der Name der Klasse wird durch das Anhängen des Namens der Spracheinstellung an\n"
-"den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).\n"
-"Die Option »-d« ist notwendig.  Die Klasse wird unter dem angegebenen Verzeichnis\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Spracheinstellung "
+"an\n"
+"den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
+"(»_«).\n"
+"Die Option »-d« ist notwendig.  Die Klasse wird unter dem angegebenen "
+"Verzeichnis\n"
 "geschrieben.\n"
 
-#: src/msgfmt.c:840
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
-#: src/msgfmt.c:846 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
-"  -d VERZEICHNIS              Basis-Verzeichnis der von der Spracheinstellung\n"
+"  -d VERZEICHNIS              Basis-Verzeichnis der von der "
+"Spracheinstellung\n"
 "                               abhängigen .dll-Dateien\n"
 
-#: src/msgfmt.c:848
+#: src/msgfmt.c:981
 #, 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 ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .dll-Datei wird in ein\n"
-"Unterverzeichnis des angegebenen Verzeichnisses geschrieben, dessen Name von\n"
+"Unterverzeichnis des angegebenen Verzeichnisses geschrieben, dessen Name "
+"von\n"
 "der Spracheinstellung abhängig ist.\n"
 
-#: src/msgfmt.c:852
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 
-#: src/msgfmt.c:856 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d VERZEICHNIS              Basis-Verzeichnis der .msg-Kataloge mit Meldungen\n"
+msgstr ""
+"  -d VERZEICHNIS              Basis-Verzeichnis der .msg-Kataloge mit "
+"Meldungen\n"
 
-#: src/msgfmt.c:858
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2033,22 +2448,24 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:862
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Optionen für Desktopeintrag-Modus:\n"
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=VORLAGE          eine als Vorlage zu verwendende .desktop-Datei\n"
+msgstr ""
+"  --template=VORLAGE          eine als Vorlage zu verwendende .desktop-"
+"Datei\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d VERZEICHNIS              Basisverzeichnis der .po-Dateien\n"
 
-#: src/msgfmt.c:872 src/xgettext.c:991
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2059,181 +2476,221 @@ msgstr ""
 "  -k, --keyword               es wird nicht nach den vorgegebenen\n"
 "                              Schlüsselwörtern gesucht\n"
 
-#: src/msgfmt.c:875
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Die Optionen -l, -o und --template sind obligatorisch. Falls -D angegeben ist,\n"
-"werden Dateien aus dem Verzeichnis anstelle der Befehlszeilenargumente gelesen.\n"
+"Die Optionen -l, -o und --template sind obligatorisch. Falls -D angegeben "
+"ist,\n"
+"werden Dateien aus dem Verzeichnis anstelle der Befehlszeilenargumente "
+"gelesen.\n"
+
+#: src/msgfmt.c:1012
+#, fuzzy, c-format
+#| msgid "Desktop Entry mode options:\n"
+msgid "XML mode options:\n"
+msgstr "Optionen für Desktopeintrag-Modus:\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, fuzzy, c-format
+#| msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+"  --template=VORLAGE          eine als Vorlage zu verwendende .desktop-"
+"Datei\n"
 
-#: src/msgfmt.c:887 src/xgettext.c:954
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Überprüfung der Eingabedatei:\n"
 
-#: src/msgfmt.c:889
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 alle Überprüfungen durchführen; umfasst:\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:892
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          sprachabhängige Formatelemente überprüfen\n"
+msgstr ""
+"      --check-format          sprachabhängige Formatelemente überprüfen\n"
 
-#: src/msgfmt.c:894
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          Existenz und Inhalt des Kopfeintrags verifizieren\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          Existenz und Inhalt des Kopfeintrags "
+"verifizieren\n"
 
-#: src/msgfmt.c:896
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          auf Konflikte zwischen Bereich-Anweisung und die\n"
+"      --check-domain          auf Konflikte zwischen Bereich-Anweisung und "
+"die\n"
 "                                Option --output-file hin überprüfen\n"
 
-#: src/msgfmt.c:899
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   sicherstellen, dass sich GNU msgfmt wie X/Open\n"
+"  -C, --check-compatibility   sicherstellen, dass sich GNU msgfmt wie X/"
+"Open\n"
 "                                msgfmt verhält\n"
 
-#: src/msgfmt.c:901
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=ZEICHEN]\n"
 "                                Vorhandensein des Tastatur-Accelerators\n"
 "                                 für Menüeinträge überprüfen\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             auch ungenaue Übersetzungen (»fuzzy«) verwenden\n"
+msgstr ""
+"  -f, --use-fuzzy             auch ungenaue Übersetzungen (»fuzzy«) "
+"verwenden\n"
 
-#: src/msgfmt.c:909
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=ZAHL        Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
 "                               ausrichten\n"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=BYTEFOLGE  32-Bit-Zahlen in der angegebenen Bytereihenfolge\n"
-"                                (»big« oder »little«, Standard von Plattform abhängig)\n"
+"      --endianness=BYTEFOLGE  32-Bit-Zahlen in der angegebenen "
+"Bytereihenfolge\n"
+"                                (»big« oder »little«, Standard von Plattform "
+"abhängig)\n"
 
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               Binärdatei soll keine Hash-Tabelle enthalten\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               Binärdatei soll keine Hash-Tabelle enthalten\n"
 
-#: src/msgfmt.c:923
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            Statistik zu den Übersetzungen anzeigen\n"
+msgstr ""
+"      --statistics            Statistik zu den Übersetzungen anzeigen\n"
 
-#: src/msgfmt.c:925 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               mehr Hinweise während der Verarbeitung geben\n"
+msgstr ""
+"  -v, --verbose               mehr Hinweise während der Verarbeitung geben\n"
 
-#: src/msgfmt.c:1038
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n"
 
 # = Konvertierung der Meldung in Hinblick auf den Zeichensatz
 # 2001-03-11 20:56:03 CET -ke-
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
 
-#: src/msgfmt.c:1051
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
-
-#: src/msgfmt.c:1053
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
-
-#: src/msgfmt.c:1077
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 
-#: src/msgfmt.c:1082
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
+msgstr ""
+"Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "»domain %s«-Anweisung wird ignoriert"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "leerer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1157
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1206
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msgfmt.c:1324
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: src/msgfmt.c:1335
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existiert, aber kann nicht gelesen werden"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:566
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:164 src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176
-#: src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "Option »%c« kann nicht verwendet werden, bevor »J«, »K«, »T«, »C« oder »X« festgelegt ist"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"Option »%c« kann nicht verwendet werden, bevor »J«, »K«, »T«, »C« oder »X« "
+"festgelegt ist"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2244,7 +2701,7 @@ msgstr ""
 
 # To avoid confusion, let msgid and msgstr untranslated here!
 # 2001-11-04 11:16:55 CET -ke-
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2327,34 +2784,43 @@ msgstr ""
 "  -v, --invert-match          Nur die Meldungen ausgeben, die nicht mit einem\n"
 "                                Auswahlkriterium übereinstimmen\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                C-Escape-Sequenzen und keine erweiterten\n"
 "                               Zeichen in Ausgabe verwenden\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sortierte Ausgabe erstellen\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          Ausgabe gemäß Vorkommen in Dateien erstellen\n"
+msgstr ""
+"      --sort-by-file          Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Ihre Sprachumgebung ist nicht bestimmt.\n"
 "Bitte setzen Sie die Umgebungsvariable LANG, wie in der Datei ABOUT-NLS\n"
-"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen können.\n"
+"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
+"können.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2366,12 +2832,12 @@ msgstr ""
 "oder die .po-Datei für die Ausgabe mit der Option »--output-file«\n"
 "fest.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s wurde erstellt.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2380,27 +2846,30 @@ msgstr ""
 "Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n"
 "Benutzers initialisieren.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=EINGABEDATEI    POT-Eingabedatei\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Wenn keine Eingabedatei angegeben ist, wird im akutellen Verzeichnis nach der\n"
+"Wenn keine Eingabedatei angegeben ist, wird im akutellen Verzeichnis nach "
+"der\n"
 "POT-Datei gesucht.  Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2408,19 +2877,23 @@ msgid ""
 msgstr ""
 "Wenn keine Ausgabedatei angegeben ist, hängt das Ergebnis von der Option\n"
 "»--locale« oder von den Lokale-Einstellungen des Benutzers ab.\n"
-"Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben ist.\n"
+"Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
+"ist.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          Lokale für die Ausgabe setzen\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2428,12 +2901,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:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "Fehler beim Lesen des aktuellen Verzeichnisses"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2441,66 +2914,74 @@ 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:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/msginit.c:1419 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "Subprozess %s mit dem Exit-Code %d fehlgeschlagen"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Der neue Katalog mit den Meldungen sollte Ihre E-Mail-Adresse enthalten, damit\n"
-"Benutzer Ihnen Rückmeldungen zur Übersetzung schicken oder Programmautoren im\n"
+"Der neue Katalog mit den Meldungen sollte Ihre E-Mail-Adresse enthalten, "
+"damit\n"
+"Benutzer Ihnen Rückmeldungen zur Übersetzung schicken oder Programmautoren "
+"im\n"
 "Falle technischer Schwierigkeiten Ihnen Fragen stellen können.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1616
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "German translation for %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-cat.c:208
+#: src/msgl-cat.c:207
 #, c-format
-msgid "domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
 msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
 "Zeichensatzes"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:554 src/xgettext.c:3532
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2509,19 +2990,21 @@ msgstr ""
 "Eingabedateien enthalten Meldungen in unterschiedlichen Kodierungen (u. a.\n"
 "UTF-8).  Die Ausgabe wird nach UTF-8 konvertiert.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 "Eingabedateien enthalten Meldungen in unterschiedlichen Kodierungen (u. a.\n"
 "%s und %s).  Die Ausgabe wird nach UTF-8 konvertiert.\n"
-"Wenn Sie eine abweichende Kodierung der Ausgabe wünschen, verwenden Sie bitte\n"
+"Wenn Sie eine abweichende Kodierung der Ausgabe wünschen, verwenden Sie "
+"bitte\n"
 "die Option --to-code.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2535,7 +3018,7 @@ msgstr ""
 "Sie sicher, dass sie von vornherein UTF-8-kodiert sind; ändern Sie dazu die\n"
 "Quellcodedateien.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2548,12 +3031,12 @@ msgstr ""
 "Ausgabe von »%s« könnte nicht korrekt sein.\n"
 "Mögliche Abhilfen:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "· LC_ALL auf eine Spracheinstellung mit der Kodierung »%s« setzen.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2564,7 +3047,7 @@ msgstr ""
 "  dann »%s« anwenden,\n"
 "  dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2577,7 +3060,7 @@ msgstr ""
 "  dann »%s« anwenden,\n"
 "  dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2588,75 +3071,80 @@ msgstr ""
 "portable Kodierung. Die Ausgabe von »%s« könnte nicht korrekt sein.\n"
 "Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "Pluralausdruck kann negative Werte ergeben"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, aber Pluralausdruck kann Werte so groß wie %lu ergeben"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "Pluralausdruck kann Teilung durch Null ergeben"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "Pluralausdruck kann einen Ganzzahl-Überlauf ergeben"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
-"Pluralausdruck kann eine arithmetische Ausnahme ergeben, möglicherweise Teilung\n"
+"Pluralausdruck kann eine arithmetische Ausnahme ergeben, möglicherweise "
+"Teilung\n"
 "durch Null"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Bitte das Folgende versuchen; gültig für %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ungültige Pluralwerte"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ungültiger Pluralausdruck"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "aber einige Meldungen haben nur eine Pluralform"
 msgstr[1] "aber einige Meldungen haben nur %lu Pluralformen"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "aber einige Meldungen haben eine Pluralform"
 msgstr[1] "aber einige Meldungen haben %lu Pluralformen"
 
-#: src/msgl-check.c:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber dem\n"
 "Kopfeintrag fehlt die Zeile:\n"
@@ -2666,7 +3154,7 @@ msgstr ""
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag beginnen nicht jeweils mit »\\n«"
@@ -2679,7 +3167,7 @@ msgstr "»msgid«- und »msgstr«-Eintrag beginnen nicht jeweils mit »\\n«"
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag enden nicht jeweils mit »\\n«"
@@ -2692,89 +3180,108 @@ msgstr "»msgid«- und »msgstr«-Eintrag enden nicht jeweils mit »\\n«"
 msgid "plural handling is a GNU gettext extension"
 msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Schnellzugriff auf"
+msgstr ""
+"»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Schnellzugriff "
+"auf"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
-msgstr "Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
+msgstr ""
+"Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII-Ellipsis („...“) anstelle von Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr "Leerzeichen vor Ellipsis in für Benutzer sichtbaren Zeichenketten gefunden"
+msgstr ""
+"Leerzeichen vor Ellipsis in für Benutzer sichtbaren Zeichenketten gefunden"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Doppelte ASCII-AnfÜhrungszeichen anstelle von Unicode gefunden"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Einfache ASCII-AnfÜhrungszeichen anstelle von Unicode gefunden"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, fuzzy, c-format
+#| msgid "ASCII ellipsis ('...') instead of Unicode"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII-Ellipsis („...“) anstelle von Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: Eingabe ist in der Kodierung »%s« nicht gültig"
 
-#: src/msgl-iconv.c:70
+#: 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:291
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/x-python.c:666 src/xgettext.c:751
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 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:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche msgids werden gleich."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche "
+"msgids werden gleich."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/x-python.c:673
-#: src/xgettext.c:758
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ist nur mit %s gültig"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "Art der Sicherung"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2798,19 +3305,19 @@ msgstr ""
 "exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
 "versucht, ein besseres Ergebnis zu erzielen.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, 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:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  Ref.pot                     Referenzen aus den neuen Quellen\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2819,7 +3326,7 @@ msgstr ""
 "  -C, --compendium=DATEI     zusätzliche Bibliothek mit Übersetzungen, es\n"
 "                              können mehrere angegeben werden\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2828,158 +3335,185 @@ msgstr ""
 "  -U, --update                Def.po aktualisieren; nichts unternehmen,\n"
 "                               wenn Def.po bereits aktuell ist\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Angaben zu Ausgabedateien im Aktualisierungsmodus:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
+msgstr ""
+"      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, 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:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Die Art der Versionskontrolle kann mit --backup oder mit der Umgebungsvariablen\n"
+"Die Art der Versionskontrolle kann mit --backup oder mit der "
+"Umgebungsvariablen\n"
 "VERSION_CONTROL gewählt werden. Mögliche Werte sind:\n"
 "  none, off       niemals Sicherungskopien erstellen (selbst wenn --backup\n"
 "                    angegeben ist)\n"
 "  numbered, t     nummerierte Sicherungskopien erstellen\n"
-"  existing, nil   nummeriert, wenn nummerierte Sicherungskopien vorhanden sind,\n"
+"  existing, nil   nummeriert, wenn nummerierte Sicherungskopien vorhanden "
+"sind,\n"
 "                    andernfalls einfache.\n"
 "  simple, never   immer einfache Sicherungskopien erstellen\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
 "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 Zeichenketten im Boost-Format erkennen\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous             die vorherigen Schlüssel der übersetzten Meldungen\n"
+"      --previous             die vorherigen Schlüssel der übersetzten "
+"Meldungen\n"
 "                              beibehalten\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       Fortschrittsanzeige unterdrücken\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "diese Meldung sollte Pluralformen definieren"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "diese Meldung sollte keine Pluralformen definieren"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 "%s%ld alte + %ld Referenzeinträge gelesen,\n"
 "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " fertig.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Aufruf: %s [OPTION] [DATEI]...\n"
 
-#: src/msgunfmt.c:432
+#: 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:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
-"  -j, --java                  Java-Modus: Eingabe ist eine ResourceBundle-Klasse\n"
+"  -j, --java                  Java-Modus: Eingabe ist eine ResourceBundle-"
+"Klasse\n"
 "                               für Java\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      C#-Ressourcenmodus: Eingabedatei ist\n"
 "                                eine .NET-.resources-Datei\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-Datei\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
+"Datei\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DATEI ...                   .mo-Eingabedateien\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Der Name der Klasse wird durch das Anhängen des Namens der Spracheinstellung\n"
-"an den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der "
+"Spracheinstellung\n"
+"an den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
+"(»_«).\n"
 "Die Option »-d« ist notwendig. Die Klasse wird mittels CLASSPATH gesucht.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2989,12 +3523,12 @@ msgstr ""
 "Unterverzeichnis des angegebenen Verzeichnisses platziert, dessen\n"
 "Name von der Spracheinstellung abhängig ist.\n"
 
-#: src/msgunfmt.c:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3003,17 +3537,19 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgunfmt.c:512
+#: 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:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                .po-Datei streng nach Uniforum-Format erstellen\n"
+msgstr ""
+"      --strict                .po-Datei streng nach Uniforum-Format "
+"erstellen\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3036,19 +3572,22 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden kumuliert. Bei Verwendung\n"
 "der Option --unique werden doppelte Einträge verworfen.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              nur doppelte Einträge ausgeben\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
-"  -u, --unique                nur nicht-doppelte Einträge ausgeben, doppelte\n"
+"  -u, --unique                nur nicht-doppelte Einträge ausgeben, "
+"doppelte\n"
 "                               verwerfen\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3111,27 +3650,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "Nicht konsistente Verwendung von #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "»msgstr[]«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "»msgid_plural«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "»msgstr«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "erste Pluralform hat einen Index ungleich Null"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "Pluralform hat einen falschen Index"
@@ -3141,7 +3680,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:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
@@ -3151,41 +3690,41 @@ msgstr "ungültige Multibyte-Sequenz"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ungültige Multibyte-Sequenz am Ende der Datei"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ungültige Multibyte-Sequenz am Ende der Zeile"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "Fehler von iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Schlüsselwort »%s« ist unbekannt"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ungültige Kontrollsequenz"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "Dateiende innerhalb einer Zeichenkette"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "Zeilenende innerhalb einer Zeichenkette"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "Kontext-Trenner <EOT> innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:325 src/xgettext.c:1103
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
@@ -3198,39 +3737,77 @@ msgstr "Mehrfachdefinition der Meldung"
 msgid "this is the location of the first definition"
 msgstr "dies ist die Stelle der ersten Definition"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+#, fuzzy
+#| msgid "warning: invalid Unicode character"
+msgid "invalid non-blank character"
+msgstr "Warnung: ungültiges Unicode-Zeichen"
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "Name des Filters fehlt"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "ungültige Pluralwerte"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "Datei »%s« ist verstümmelt"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Datei »%s« hat eine nicht mit NUL terminierte Zeichenkette"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "Datei »%s« hat eine nicht mit NUL terminierte Zeichenkette"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Datei »%s« ist nicht im GNU .mo-Format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "Datei »%s« hat bei %s eine nicht mit NUL terminierte Zeichenkette"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "Warnung: ungültige \\uxxxx-Syntax für ein Unicode-Zeichen"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: Warnung: Einzelnes Surrogat U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "Warnung: ungültiges Unicode-Zeichen"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "Warnung: Zeichenkette nicht terminiert"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "Warnung: Syntaxfehler"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "Warnung: nicht terminiertes Schlüssel/Wert-Paar"
 
@@ -3238,11 +3815,11 @@ msgstr "Warnung: nicht terminiertes Schlüssel/Wert-Paar"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "Warnung: Syntaxfehler, »;« nach der Zeichenkette erwartet"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "Warnung: Syntaxfehler, »=« oder »;« nach der Zeichenkette erwartet"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Geschrieben von %s und %s.\n"
@@ -3251,16 +3828,16 @@ msgstr "Geschrieben von %s und %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Serbischen Text von kyrillischer nach lateinischer Schreibweise umkodieren.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3269,27 +3846,28 @@ msgstr ""
 "Der Eingabetext wird von der Standardeingabe gelesen  Der umgewandelte Text\n"
 "wird nach der Standardausgabe ausgegeben.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "Eingabe ist in der Kodierung »%s« nicht gültig"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "Fehler beim Konvertieren von der Kodierung »%s« nach der Kodierung »%s«"
+msgstr ""
+"Fehler beim Konvertieren von der Kodierung »%s« nach der Kodierung »%s«"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "zwei Argumente werden erwartet"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Aufruf: %s [OPTION] URL DATEI\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3298,114 +3876,142 @@ msgstr ""
 "URL holen und Inhalt ausgeben. Wenn auf den URL nicht zugegriffen werden kann,\n"
 "wird die lokal zugängliche Datei stattdessen verwendet.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "Fehler beim Schreiben in die Standardausgabe"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "Fehler nach dem Lesen von »%s«"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "%s wird geholt..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " Zeitlimit überschritten.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " fehlgeschlagen.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit dem angegebenen Ausgabeformat auszugeben. Versuchen Sie als Ersatz auf die PO-Dateien-Syntax auszuweichen."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit dem "
+"angegebenen Ausgabeformat auszugeben. Versuchen Sie als Ersatz auf die PO-"
+"Dateien-Syntax auszuweichen."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit dem angegebenen Ausgabeformat auszugeben."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit dem "
+"angegebenen Ausgabeformat auszugeben."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "Katalog mit Meldungen weist kontextabhängige Übersetzungen auf, aber das Ausgabeformat unterstützt diese nicht."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"Katalog mit Meldungen weist kontextabhängige Übersetzungen auf, aber das "
+"Ausgabeformat unterstützt diese nicht."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "Der Katalog mit den Meldungen weist Übersetzungen mit Pluralformen auf, aber das Ausgabeformat unterstützt solche nicht. Versuchen Sie, eine Java-Klasse mit »msgfmt --java« zu erstellen und keine »properties«-Datei."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"Der Katalog mit den Meldungen weist Übersetzungen mit Pluralformen auf, aber "
+"das Ausgabeformat unterstützt solche nicht. Versuchen Sie, eine Java-Klasse "
+"mit »msgfmt --java« zu erstellen und keine »properties«-Datei."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das Ausgabeformat unterstützt keine Pluralbehandlung."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das "
+"Ausgabeformat unterstützt keine Pluralbehandlung."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Fehler beim Anlegen des Verzeichnisses »%s«"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
+msgstr ""
+"Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen"
 
-#: src/write-java.c:1092
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kein gültiger Name einer Java-Klasse: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, 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:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
-"Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie, $JAVAC\n"
+"Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie, "
+"$JAVAC\n"
 "zu setzen"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
-
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "unvollständige Multibyte-Sequenz"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
+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:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3419,7 +4025,7 @@ msgstr ""
 "ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3428,7 +4034,8 @@ msgid ""
 "%s\n"
 msgstr ""
 "Die folgende msgid enthält Zeichen, die nicht ASCII-kodiert sind.\n"
-"Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die Übersetzer\n"
+"Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die "
+"Übersetzer\n"
 "eine andere Zeichen-Kodierung als Sie verwenden. Bitte auf eine msgid\n"
 "ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
@@ -3443,11 +4050,13 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"Katalog mit Meldungen weist msgctxt-Zeichenketten auf, deren Zeichen außerhalb\n"
+"Katalog mit Meldungen weist msgctxt-Zeichenketten auf, deren Zeichen "
+"außerhalb\n"
 "von ISO-8859-1 liegen, aber das Qt-Format für Kataloge mit Meldungen\n"
 "unterstützt Unicode nur in übersetzten Zeichenketten, nicht in\n"
 "Kontext-Zeichenketten\n"
@@ -3458,16 +4067,19 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"Katalog mit Meldungen weist msgid-Zeichenketten auf, deren Zeichen außerhalb von\n"
-"ISO-8859-1 liegen, aber das Qt-Format für Kataloge mit Meldungen unterstützt\n"
-"Unicode nur in übersetzten Zeichenketten, nicht in unübersetzten Zeichenketten\n"
+"Katalog mit Meldungen weist msgid-Zeichenketten auf, deren Zeichen außerhalb "
+"von\n"
+"ISO-8859-1 liegen, aber das Qt-Format für Kataloge mit Meldungen "
+"unterstützt\n"
+"Unicode nur in übersetzten Zeichenketten, nicht in unübersetzten "
+"Zeichenketten\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "Fehler beim Schreiben zum Subprozess %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3475,7 +4087,7 @@ msgstr ""
 "Katalog mit Meldungen weist kontextabhängige Übersetzungen auf, aber das\n"
 ".resources-Format von C# unterstützt keine Kontextangaben\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3483,7 +4095,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das\n"
 ".resources-Format von C# unterstützt keine Pluralbehandlung\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3491,7 +4103,7 @@ msgstr ""
 "Katalog mit Meldungen weist kontextabhängige Übersetzungen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Kontextangaben\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3499,36 +4111,56 @@ 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:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
 
-#: src/x-c.c:1153
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "Warnung: ungültiges Unicode-Zeichen"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-c.c:1464 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
 
-#: src/x-c.c:1520 src/x-c.c:1571 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:225 src/xgettext.c:2168
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3537,7 +4169,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3546,7 +4178,7 @@ msgstr ""
 "%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3555,7 +4187,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3564,12 +4196,12 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: Fehler von iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3578,335 +4210,148 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: Warnung: nicht terminierte konstante Zeichenkette"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: Warnung: »)« gefunden, wo »}« erwartet wurde"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: Warnung: »}« gefunden, wo »)« erwartet wurde"
 
-#: src/x-glade.c:296
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Kontext für die aus dem Element »%s« extrahierte Zeichenkette fehlt"
-
-#: src/x-glade.c:418
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Das Root-Element <%s> ist in einer Glade-Datei nicht zulässig"
-
-# CHECKIT
-#: src/x-glade.c:573 src/x-glade.c:580
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
-
-#: src/x-glade.c:607
+#: src/xgettext.c:567
 #, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
-"Die Sprache »glade« wird nicht unterstützt. %s hängt von expat ab.\n"
-"Diese Version wurde ohne expat erstellt.\n"
+"»%s« ist kein gültiger Name für eine Zeichenkodierung. ASCII wird "
+"ersatzweise verwendet.\n"
 
-#: src/x-java.c:494
+#: src/xgettext.c:637
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: Warnung: Einzelnes Surrogat U+%04X"
-
-#: src/x-javascript.c:231
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:276
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+msgid "syntax check '%s' unknown"
+msgstr "Syntaxprüfung „%s“ ist unbekannt"
 
-#: src/x-javascript.c:292
+#: src/xgettext.c:646
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+msgid "sentence end type '%s' unknown"
+msgstr "Satzende vom Typ „%s“ ist unbekannt"
 
-#: src/x-javascript.c:304
+#: src/xgettext.c:701
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
+msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+"»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
+"geschrieben wird"
 
-#: src/x-javascript.c:313
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
+msgid "xgettext cannot work without keywords to look for"
 msgstr ""
-"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
-"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+"ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/x-javascript.c:345
+#: src/xgettext.c:839
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
-"%s:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
-
-#: src/x-javascript.c:955
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: Warnung: RegExp-Literal wurde zu früh terminiert"
-
-#: src/x-javascript.c:1056
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: Warnung: %s ist nicht erlaubt"
-
-#: src/x-javascript.c:1070
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: Warnung: nicht geschlossene XML-Sequenz"
-
-#: src/x-perl.c:308
-#, c-format
-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:1043
+#: src/xgettext.c:920
 #, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: rechte Klammer bei \\x{HEXZAHL} fehlt"
-
-#: 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: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: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: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: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«"
-
-#: src/x-python.c:279
 msgid ""
-"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"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
 
-#: src/x-python.c:325
+#: src/xgettext.c:938
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
-"%s:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
+"Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/x-python.c:342
+#: src/xgettext.c:1027
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "Extract translatable strings from given input files.\n"
 msgstr ""
-"%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
+"Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/x-python.c:355
+#: src/xgettext.c:1050
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
-"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
+"  -d, --default-domain=NAME   Ausgabe in NAME.po (anstatt in messages.po)\n"
 
-#: src/x-python.c:365
+#: src/xgettext.c:1052
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
-"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
+"  -o, --output=DATEI          Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/x-python.c:398
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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:%d: Ungültige Multibyte-Sequenz.\n"
-"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem Kommentar\n"
-"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert ist.\n"
-
-#: src/x-python.c:723
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
-
-#: src/x-rst.c:109
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: ungültige Definition einer Zeichenkette"
-
-#: src/x-rst.c:173
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: Zahl nach # fehlt"
-
-#: src/x-rst.c:208
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette"
-
-#: src/x-sh.c:1075
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet zu betrachten; verwenden Sie stattdessen use eval_gettext"
-
-#: src/x-vala.c:414
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: Warnung: Literal des regulären Ausdrucks zu früh terminiert"
-
-#: src/xgettext.c:555
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "»%s« ist kein gültiger Name für eine Zeichenkodierung. ASCII wird ersatzweise verwendet.\n"
-
-#: src/xgettext.c:624
-#, c-format
-msgid "syntax check '%s' unknown"
-msgstr "Syntaxprüfung „%s“ ist unbekannt"
-
-#: src/xgettext.c:633
-#, c-format
-msgid "sentence end type '%s' unknown"
-msgstr "Satzende vom Typ „%s“ ist unbekannt"
-
-#: src/xgettext.c:679
-#, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
-"geschrieben wird"
-
-#: src/xgettext.c:684
-#, 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:839
-#, 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:908
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
-
-#: src/xgettext.c:931
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAME   Ausgabe in NAME.po (anstatt in messages.po)\n"
-
-#: src/xgettext.c:933
-#, 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:935
-#, 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"
+"  -p, --output-dir=VERZ       Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
-#: src/xgettext.c:940
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:942
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAME          erkennt die angegebene Programmiersprache\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:951
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
-"Gemäß Vorgabe wird die Sprache anhand des Suffixes des Namens der Eingabedatei\n"
+"Gemäß Vorgabe wird die Sprache anhand des Suffixes des Namens der "
+"Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:956
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3915,48 +4360,59 @@ msgstr ""
 "      --from-code=NAME        Kodierung der Eingabedateien\n"
 "                               (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:959
+#: src/xgettext.c:1078
 #, 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:964
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         Meldungen an existierende Datei anhängen\n"
+msgstr ""
+"  -j, --join-existing         Meldungen an existierende Datei anhängen\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=DATEI.po Einträge aus DATEI.po nicht herausholen\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cKENNUNG, --add-comments=KENNUNG\n"
-"                              Kommentare, die mit KENNUNG beginnen und welche\n"
-"                               einer Zeile mit Schlüsselworten vorausgehen in\n"
+"                              Kommentare, die mit KENNUNG beginnen und "
+"welche\n"
+"                               einer Zeile mit Schlüsselworten vorausgehen "
+"in\n"
 "                               die Ausgabedatei schreiben.\n"
 "  -c, --add-comments          Alle Kommentarblöcke, die einer Zeile mit\n"
 "                               Schlüsselworten vorausgehen, in die\n"
 "                               Ausgabedatei schreiben.\n"
 
-#: src/xgettext.c:973
-#, c-format
+#: src/xgettext.c:1092
+#, fuzzy, c-format
+#| msgid ""
+#| "      --check=NAME            perform syntax check on messages\n"
+#| "                                (ellipsis-unicode, space-ellipsis,\n"
+#| "                                 quote-unicode)\n"
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
-"      --check=NAME            Syntaxprüfung für Meldungen durchführen                                (ellipsis-unicode, space-ellipsis,\n"
+"      --check=NAME            Syntaxprüfung für Meldungen "
+"durchführen                                (ellipsis-unicode, space-"
+"ellipsis,\n"
 "                                 quote-unicode)\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3967,21 +4423,22 @@ msgstr ""
 "                                (single-space, die Vorgabe, \n"
 "                                 oder double-space)\n"
 
-#: src/xgettext.c:982
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:984
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:986
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
@@ -3991,33 +4448,39 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source, Glade\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:994
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                                (nur die Sprachen C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (nur die Sprachen C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-Source, Glade\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:999
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=WORT:ARG:FLAG    zusätzliches Flag für Zeichenketten innerhalb der\n"
+"      --flag=WORT:ARG:FLAG    zusätzliches Flag für Zeichenketten innerhalb "
+"der\n"
 "                               Argumentzahl ARG des Schlüsselworts WORT\n"
 
-#: src/xgettext.c:1002
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
@@ -4027,208 +4490,675 @@ msgstr ""
 "                                Perl, PHP, GCC-source\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1007
+#: src/xgettext.c:1126
 #, 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:1009
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (nur die Programmiersprachen C, C++,\n"
 "                                 ObjectiveC)\n"
 
-#: src/xgettext.c:1011
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (nur die Programmiersprache C++)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:1013 src/xgettext.c:1017 src/xgettext.c:1021
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:1015
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   Zeichenketten im KDE 4-Format erkennen\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:1023
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:1048
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     eine ».properties«-Datei von Java erstellen\n"
+msgstr ""
+"      --properties-output     eine ».properties«-Datei von Java erstellen\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --indent                Ausgabe eingerückt darstellen\n"
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=KETTE   Uhrheberrechtsinhaber in Ausgabe setzen\n"
+msgstr ""
+"      --copyright-holder=KETTE   Uhrheberrechtsinhaber in Ausgabe setzen\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          keine Zeile mit FSF-Copyright in Ausgabe\n"
 "                               einfügen\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1192
 #, 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:1069
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
-#: src/xgettext.c:1071
+#: src/xgettext.c:1196
 #, 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"
+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:1073
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -m[ZEICHENKETTE], --msgstr-prefix[=ZEICHENKETTE]\n"
-"                                ZEICHENKETTE oder \"\" als Präfix für msgstr\n"
+"                                ZEICHENKETTE oder \"\" als Präfix für "
+"msgstr\n"
 "                                 nehmen\n"
 
-#: src/xgettext.c:1076
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -M[ZEICHENKETTE], --msgstr-suffix[=ZEICHENKETTE]\n"
-"                                ZEICHENKETTE oder \"\" als Suffix für msgstr\n"
+"                                ZEICHENKETTE oder \"\" als Suffix für "
+"msgstr\n"
 "                                 nehmen\n"
 
-#: src/xgettext.c:1902
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: "
+"%s"
 
-#: src/xgettext.c:2027
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:2133
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Die Option --msgid-bugs-address wurde nicht angegeben.\n"
+"Wenn Sie die Datei »Makevars« verwenden, füllen Sie bitte dort die\n"
+"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:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "Programmiersprache »%s« unbekannt"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Ungültige Multibyte-Sequenz.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:303
+#, 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:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:312
+#, 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:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:344
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Ungültige Multibyte-Sequenz.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:919
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: Warnung: RegExp-Literal wurde zu früh terminiert"
 
-#: src/xgettext.c:2137
+#: src/x-javascript.c:1027
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Nicht in ASCII kodierter Kommentar bei oder vor %s%s."
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: Warnung: %s ist nicht erlaubt"
 
-#: src/xgettext.c:2142
+#: src/x-javascript.c:1041
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Nicht in ASCII kodierte Zeichenkette bei oder vor %s%s."
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: Warnung: nicht geschlossene XML-Sequenz"
 
-#: src/xgettext.c:2248 src/xgettext.c:2281 src/xgettext.c:2346
+#: src/x-perl.c:339
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: Warnung: "
+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/xgettext.c:2251
+#: src/x-perl.c:1074
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Obwohl es an der Position eines Formatelements verwendet wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: rechte Klammer bei \\x{HEXZAHL} fehlt"
 
-#: src/xgettext.c:2252
+#: src/x-perl.c:1195
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Obwohl es so deklariert wurde, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d: ungültige Interpolation (»\\l«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/xgettext.c:2283
+#: src/x-perl.c:1215
 #, 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:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: ungültige Interpolation einer Variablen bei »%c«"
+
+#: src/x-perl.c:1262
+#, 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:1279
+#, 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-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
+
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Das Formatelement »%s« mit den unbezeichneten Argumenten kann nicht in\n"
-"geeigneter Form lokalisiert werden:\n"
-"Die Übersetzerin kann die Argumente nicht umsortieren.\n"
-"Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
-"und einem Mapping anstelle eines Tupels für die Argumente.\n"
+"%s:%d: Ungültige Multibyte-Sequenz.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
 
-#: src/xgettext.c:2348
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"»msgid« ist leer.  Dies ist für GNU gettext reserviert:\n"
-"gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
-"zurück, keine leere Zeichenkette.\n"
+"%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
 
-#: src/xgettext.c:3085
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
+
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Ungültige Multibyte-Sequenz.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code oder mit einem "
+"Kommentar\n"
+"angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
+"ist.\n"
+
+#: src/x-python.c:654
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
 
-#: src/xgettext.c:3112
+#: src/x-rst.c:116
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: ungültige Definition einer Zeichenkette"
 
-#: src/xgettext.c:3137
+#: src/x-rst.c:180
 #, 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«"
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: Zahl nach # fehlt"
 
-#: src/xgettext.c:3158
+#: src/x-rst.c:215
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette"
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ungültige Definition einer Zeichenkette"
 
-#: src/xgettext.c:3533
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ungültige Definition einer Zeichenkette"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
 msgstr ""
-"Die Option --msgid-bugs-address wurde nicht angegeben.\n"
-"Wenn Sie die Datei »Makevars« verwenden, füllen Sie bitte dort die\n"
-"Variable MSGID_BUGS_ADDRESS aus; falls nicht, geben Sie bitte die\n"
-"Option an der Befehlszeile mit --msgid-bugs-address an.\n"
+"%s:%lu: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet "
+"zu betrachten; verwenden Sie stattdessen use eval_gettext"
 
-#: src/xgettext.c:3753
+#: src/x-vala.c:616
 #, c-format
-msgid "language '%s' unknown"
-msgstr "Programmiersprache »%s« unbekannt"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: Warnung: Literal des regulären Ausdrucks zu früh terminiert"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "ungültige Kontrollsequenz"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "kein gültiger Name einer Java-Klasse: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "kein gültiger Name einer Java-Klasse: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "ungültige Kontrollsequenz"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "ungültiger Endian-Wert: %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "ungültiges Argument %s für %s"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "Name des Filters fehlt"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »--%s« erwartet kein Argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: unbekannte Option »--%s«\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »-W %s« erwartet kein Argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: Option »-W %s« erwartet ein Argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr ""
+#~ "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler "
+#~ "melden\n"
+
+#, c-format
+#~ msgid "Missing context for the string extracted from '%s' element"
+#~ msgstr "Kontext für die aus dem Element »%s« extrahierte Zeichenkette fehlt"
+
+# CHECKIT
+#, c-format
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Die Sprache »glade« wird nicht unterstützt. %s hängt von expat ab.\n"
+#~ "Diese Version wurde ohne expat erstellt.\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Nicht in ASCII kodierter Kommentar bei oder vor %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Nicht in ASCII kodierte Zeichenkette bei oder vor %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: Warnung: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Obwohl es an der Position eines Formatelements verwendet wird, ist %s "
+#~ "kein gültiges %s Formatelement. Der Grund: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Obwohl es so deklariert wurde, ist %s kein gültiges %s Formatelement. Der "
+#~ "Grund: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Das Formatelement »%s« mit den unbezeichneten Argumenten kann nicht in\n"
+#~ "geeigneter Form lokalisiert werden:\n"
+#~ "Die Übersetzerin kann die Argumente nicht umsortieren.\n"
+#~ "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
+#~ "und einem Mapping anstelle eines Tupels für die Argumente.\n"
+
+#~ 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 ""
+#~ "»msgid« ist leer.  Dies ist für GNU gettext reserviert:\n"
+#~ "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
+#~ "zurück, keine leere Zeichenkette.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
+
+#, 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«"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
+
 #~ msgid "header field '%s' should start at beginning of line\n"
 #~ msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
+#~ msgstr ""
+#~ "Einige Felder im Kopfeintrag haben immer noch den anfänglichen "
+#~ "Vorgabewert\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: unzulässige Option -- %c\n"
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index e9b9bc746..ddc3564d6 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,7 +6,7 @@ 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: 2019-04-13 11:21+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"
@@ -14,43 +14,43 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:325
 #, 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:339
 #, 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:435
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "�������� ����������� ������� ������ \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:450
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "�������� ���������� ��� �������� \"%s\""
@@ -59,164 +59,148 @@ msgstr "�������� ���������� ��� �������� \"%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-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:179
 #, fuzzy, c-format
-msgid "cannot open backup file \"%s\" for writing"
+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:183
 #, fuzzy, c-format
-msgid "error reading \"%s\""
+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:187
 #, fuzzy, c-format
-msgid "error writing \"%s\""
+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:191
 #, fuzzy, c-format
-msgid "error after reading \"%s\""
+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
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:443
 #, c-format
-msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:343
+#: gnulib-lib/csharpexec.c:255
 #, c-format
-msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, 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:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%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"
-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"
-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"
-msgstr "%s: � ������� `%s' ������� ���������\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: �� ������������ ������� `--%s'\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: �� ������������ ������� `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: �� ������������ ������� `%c%s'\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: � ������� `%s' ������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+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"
-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"
-msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, 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
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -226,107 +210,298 @@ 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:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, 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/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, 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:265
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "�������� ����������� ������� ������ \"%s\""
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
+msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:52
+#
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "�������� ����������� ������� ������ \"%s\""
+
+#: gnulib-lib/w32spawn.h:49
 #, 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:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "�������� ����������� ������� ������ \"%s\""
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "��������� `%s --help' ��� ������������ �����������.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr ""
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+
+#
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+#, fuzzy
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "������� �������� ��������� ��� <bug-gnu-utils@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "�������� ��� ���/��� %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+msgid "cannot extract rules for %s"
+msgstr "�������� ���������� ��� �������� \"%s\""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "������ ��� ������� ��� \"%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
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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
@@ -334,109 +509,125 @@ msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:181
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+
+#: src/format-c.c:36
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:588
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, 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' �� ���������"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:130 src/format-java.c:191
+#: src/format-csharp.c:127 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:161 src/format-java.c:346
+#: src/format-csharp.c:158 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 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-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -529,95 +720,123 @@ 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
-#: src/format-scheme.c:2375
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+#
+#: src/format-kde.c:242
+#, fuzzy, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
+
+#
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "������ ���� �������� ��� \"%s\""
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, 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] ""
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, 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
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:433
@@ -627,61 +846,78 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
+#: src/format-python-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
 
-#: src/format-python.c:112
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
+#: 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
@@ -718,74 +954,41 @@ 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
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#
-#: src/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
-#, 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:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, 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
-#, 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:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -793,349 +996,409 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 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:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, 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
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
 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
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
+#
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "������ �� �������� ����������� ��� ������"
+
+#
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+msgid "cannot create XPath context"
+msgstr "�������� ����������� ������� ������ \"%s\""
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr ""
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
 msgstr ""
 
 #
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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
-#, fuzzy
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "������� �������� ��������� ��� <bug-gnu-utils@gnu.org>.\n"
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+msgid "cannot read %s: %s"
+msgstr "�������� ����������� ������� ������ \"%s\""
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:1658
 #, c-format
-msgid "could not get host name"
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
 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/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "�������� ����������� ������� ������ \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, 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:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, 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:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:426
 #, 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:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, 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:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, 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:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, 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:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, 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:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:452
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:454
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:484
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:488
 #, 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:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, 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:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, 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:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, 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:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, 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:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, 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:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, 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:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, 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:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, 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:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, 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:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1153,33 +1416,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:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, 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:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:1023
 #, 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"
@@ -1188,9 +1451,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "  -V, --version                  �������� ����������� ������� ������������\n"
 "                                   ��� ������\n"
@@ -1209,108 +1472,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:1039
 #, 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:1041
 #, 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:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, 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:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, 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:337 src/msguniq.c:378
 #, 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:380
 #, 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:345 src/msgmerge.c:628
 #, 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:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr ""
 
 #
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "��� ������������ ������ �������"
 
 #
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:207
+#: src/msgcmp.c:217
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1336,88 +1591,93 @@ msgstr ""
 "����� �����������. ���� ��� ��� ����������� ������� ������o����,\n"
 "������� �������� ��������� ��� �������� ������������.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:246
 #, 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:1576
 #, 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:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...���� ����� � ������� ����� ���������"
 
 #
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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"
@@ -1425,7 +1685,7 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1446,76 +1706,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:1186
 #, c-format
 msgid ""
-"      --omit-header           don't write header with `msgid \"\"' entry\n"
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:339
 #, 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:363 src/msgen.c:359 src/msgmerge.c:642
 #, 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:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, 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:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
 msgid ""
-"      --add-location          preserve '#: filename:line' lines (default)\n"
+"  -n, --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:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, 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:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "��� ������ ������ �������"
 
 #
-#: src/msgen.c:233
+#: src/msgen.c:263
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgen.c:274
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1524,23 +1784,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #
-#: src/msgexec.c:194
+#: src/msgexec.c:201
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "������������ ��������"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1550,69 +1810,88 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:276
 #, 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
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "�������� �������"
+
+#: src/msgexec.c:283
 #, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
-msgid "write to stdout failed"
+msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:355
 #, c-format
-msgid "write to %s subprocess failed"
+msgid "write to stdout failed"
 msgstr ""
 
 #
-#: src/msgfilter.c:296
+#: src/msgfilter.c:304
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "������������ ��������"
 
 #
-#: src/msgfilter.c:320
+#: src/msgfilter.c:324
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "������ �� �������� ����������� ��� ������"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:441
 #, 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:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1620,210 +1899,239 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:459
 #, 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:477 src/msggrep.c:600
 #, 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:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:485
 #, 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:665
+#, fuzzy, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
-#: src/msgfilter.c:616
+#: src/msgfmt.c:372
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfilter.c:644
+#: src/msgfmt.c:419
 #, c-format
-msgid "communication with %s subprocess failed"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfilter.c:711
+#: src/msgfmt.c:471
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
+msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:302
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, 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
-msgid "Ulrich Drepper"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "�� %s ��� %s ����� �������� ������������"
+
+#: src/msgfmt.c:626 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:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 #
-#: src/msgfmt.c:599
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "�������� ����������� ������� ������ \"%s\""
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#
+#: src/msgfmt.c:876
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ������������ ��������"
 
 #
-#: src/msgfmt.c:604
+#: src/msgfmt.c:881
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d �������������� �����������"
 
 #
-#: src/msgfmt.c:609
+#: src/msgfmt.c:886
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �� ������������ ��������"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
-#, 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:922
 #, 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:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:931
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:937
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:957
 #, 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:959 src/msgfmt.c:975 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:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1833,48 +2141,93 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgfmt.c:690
+#: src/msgfmt.c:973
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:979 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:981
 #, 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:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:991
 #, 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:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1882,33 +2235,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1043
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1045
 #, 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:1048
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1916,67 +2269,64 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:1058
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
+
+#: src/msgfmt.c:1063
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1072
 #, 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:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1185
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:872
+#: src/msgfmt.c:1187
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:882
-#, fuzzy, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr ""
-"%s: �������������: �� ������ ������� �������� �������������� �����������"
-
-#: src/msgfmt.c:884
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-
-#
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�� ����� ��� �� ������� \"%s\" ��� ����� ��������� ��� ����� �������"
 
 #
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1984,57 +2334,71 @@ msgstr ""
 "����� ����� ����������"
 
 #
-#: src/msgfmt.c:927
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "� ������ `domain %s' ���������"
 
 #
-#: src/msgfmt.c:987
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "� ���� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:988
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "� ������������� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+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:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:501
 #, 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:521
 #, 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:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2074,30 +2438,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:602
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2105,24 +2471,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:371
 #, 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:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:383
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2130,54 +2496,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:391
 #, 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:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:406
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:472
 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:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:493
 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:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1117
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2189,54 +2555,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:1621
 #, 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:178 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:258
 #, 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"
+"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 "
+"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:392 src/msgl-iconv.c:366
 #, 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:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:444
 #, 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:450
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2245,7 +2611,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2254,7 +2620,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2263,12 +2629,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2276,7 +2642,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2285,7 +2651,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2293,66 +2659,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:145
 #, 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:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:270
 #, 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:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:338
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:360
+#: src/msgl-check.c:446
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:392
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2360,140 +2726,153 @@ msgstr[0] "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 msgstr[1] "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgl-check.c:408
+#: src/msgl-check.c:494
 #, 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:518
 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:616
 #, fuzzy
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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:623
 #, fuzzy, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:549
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:567
+#: src/msgl-check.c:657
 #, fuzzy
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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:664
 #, fuzzy, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:590
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:695
+#: src/msgl-check.c:818
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
 
 #
-#: src/msgl-check.c:703
+#: src/msgl-check.c:835
 #, fuzzy, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
+msgid "header field '%s' missing in header\n"
+msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
 
-#
-#: src/msgl-check.c:717
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
-msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#
-#: src/msgl-check.c:730
-#, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "�� ����� `%s' ���� ����� ��� ������ �� ������� ����"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+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:288
 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:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, 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:330
 #, 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:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
 #
-#: src/msgmerge.c:458
+#: src/msgmerge.c:545
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2519,51 +2898,51 @@ msgstr ""
 "�� ������������ ��������� ���� �������� ����� ����� ��� �� ��������\n"
 "������ ������ ������.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:568
 #, 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:574
 #, 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:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2575,44 +2954,45 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the "
+"The backup suffix is '~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:610
 #, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
 msgstr ""
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 #
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1685
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1706
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2110
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2622,62 +3002,64 @@ msgstr ""
 "����� ���������� %d, �������������� %d.\n"
 
 #
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, 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 "
@@ -2686,41 +3068,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:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2733,19 +3115,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:366
 #, 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 ""
@@ -2759,28 +3141,28 @@ msgid ""
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2788,7 +3170,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2796,143 +3178,182 @@ msgid ""
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
 #
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:241
 #, fuzzy, c-format
-msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:250
 #, fuzzy, c-format
-msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:257
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "������ ������� `msgstr'"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 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:505 src/write-po.c:812 src/write-po.c:949
 #, 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:474
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "�� �������� ����� ���������� ��������"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:745
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "������� ������ \"%s\""
 
 #
-#: src/po-lex.c:855
+#: src/po-lex.c:852
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/po-lex.c:982
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "����� ������� (EOF) ��� �������������"
 
 #
-#: src/po-lex.c:988
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "�����-������� (eol) ��� �������������"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���� �� ������ ��� ������ �� �������� ������� ��� �� �������"
 
 #
-#: src/read-catalog.c:372
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "����������������� ������� ���������"
 
 #
-#: src/read-catalog.c:374
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "���� ����� � ���� ��� ������ �������"
 
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
 #
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+msgid "missing '=' after \"%s\""
+msgstr "������������ ��������"
+
+#
+#: src/read-desktop.c:468
+#, fuzzy
+msgid "invalid non-blank line"
+msgstr "�� �������� ����� ���������� ��������"
+
+#
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "�� ������ \"%s\" ����������� ��� �� ������� �������� �� ����"
 
 #
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
 #
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
+
+#
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
 #
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
 #
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
 
 #
+#: src/read-properties.c:429
+#, fuzzy, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: �������������: �� ������������ ������� ����������"
+
+#
 #: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
@@ -2951,7 +3372,7 @@ msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
@@ -2963,7 +3384,7 @@ msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "�������� ��� ���/��� %s.\n"
@@ -2972,45 +3393,45 @@ msgstr "�������� ��� ���/��� %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:363
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: src/urlget.c:146
+#: src/urlget.c:158
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "���� ����� ��������"
 
-#: src/urlget.c:163
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3018,100 +3439,136 @@ msgid ""
 msgstr ""
 
 #
-#: src/urlget.c:219
+#: src/urlget.c:227
+#, fuzzy, c-format
+msgid "error reading \"%s\""
+msgstr "������ ���� �������� ��� \"%s\""
+
+#
+#: src/urlget.c:233
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: src/write-catalog.c:126
+#
+#: src/urlget.c:237
+#, fuzzy, c-format
+msgid "error after reading \"%s\""
+msgstr "������ ���� �������� ��� \"%s\""
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
+#: src/write-catalog.c:125
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:129
+#: src/write-catalog.c:128
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:162
+#: src/write-catalog.c:161
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
+#: src/write-catalog.c:196
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
+#: src/write-catalog.c:201
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
 #
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "�������� ����������� ������� ������ \"%s\""
 
 #
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "�������� ������"
 
 #
-#: src/write-csharp.c:688
+#: src/write-csharp.c:708
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "�������� ������� ��� �������� \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
 #
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
+#: src/write-po.c:821
+#, fuzzy
+msgid "incomplete multibyte sequence"
+msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/write-po.c:766
-#, c-format
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
 msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
+"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:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3120,7 +3577,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3129,21 +3586,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3151,100 +3608,126 @@ msgid ""
 msgstr ""
 
 #
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:133
 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:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "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:340 src/x-javascript.c:748 src/x-python.c:866
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, 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:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, fuzzy, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: �������������: �� ������������ ������� ����������"
+
+#
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
 
 #
-#: src/x-c.c:1218
+#: src/x-c.c:1654 src/x-vala.c:907
 #, 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:225
+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-javascript.c:321 src/x-python.c:375
 #, 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"
@@ -3252,207 +3735,100 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1387 src/x-python.c:1266
-#, 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:1451 src/x-java.c:668
 #, 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:1953 src/x-java.c:1153
 #, 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:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:645
+#: src/xgettext.c:567
 #, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
 #
-#: src/x-java.c:492
+#: src/xgettext.c:637
 #, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#: src/x-perl.c:307
-#, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-
-#: src/x-perl.c:1038
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
-
-#: src/x-perl.c:1158
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "� ������ `%s' ����� �������"
 
-#: src/x-perl.c:1178
+#: src/xgettext.c:646
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
 #
-#: src/x-perl.c:1212
-#, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: �� ������ ������� -- %c\n"
-
-#: src/x-perl.c:1225
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1242
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-python.c:233
+#: src/xgettext.c:701
 #, c-format
-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
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-
-#: src/x-python.c:298
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
+"�� --join-existing �� ������ �� �������������� ���� � ������ �������� ���� "
+"�������� �����"
 
-#: src/x-python.c:311
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/xgettext.c:839
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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:674
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-
-#: src/x-rst.c:109
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr ""
-
-#: src/x-rst.c:173
-#, c-format
-msgid "%s:%d: missing number after #"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
 #
-#: src/x-rst.c:208
+#: src/xgettext.c:938
 #, fuzzy, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#: src/x-sh.c:1075
-#, c-format
-msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
-msgstr ""
-
-#
-#: src/xgettext.c:567
-#, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"�� --join-existing �� ������ �� �������������� ���� � ������ �������� ���� "
-"�������� �����"
-
-#: src/xgettext.c:572
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr ""
-
-#
-#: src/xgettext.c:715
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "�������������: �� ������ `%s' �� �������� `%s' ����� ������� �� ���������� C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:1050
 #, 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:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:798
+#: src/xgettext.c:1059
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:1061
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3461,77 +3837,101 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:1070
 #, 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:1075
 #, 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:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:1087
 #, 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:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3539,183 +3939,508 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
 #, 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:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:1146
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:1190
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:1198
 #, 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:1201
 #, 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:1597
 #, 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:1695
 msgid "standard input"
 msgstr "�������� �������"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+#
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "� ������ `%s' ����� �������"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
 #, c-format
-msgid "%s%s: warning: "
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/x-javascript.c:344
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: �������������: �� ������������ ������� ����������"
+
+#
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/x-perl.c:1074
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/x-perl.c:1195
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/x-perl.c:1215
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2828
+#
+#: src/x-perl.c:1249
+#, fuzzy, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s: �� ������ ������� -- %c\n"
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-python.c:279
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:325
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:342
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:355
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:365
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:398
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr ""
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
 msgstr ""
 
 #
-#: src/xgettext.c:3035
+#: src/x-rst.c:215
+#, fuzzy, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-rst.c:676
+#, fuzzy, c-format
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/x-rst.c:683
+#, fuzzy, c-format
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "language `%s' unknown"
-msgstr "� ������ `%s' ����� �������"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
 #
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+msgid "invalid UTF-8 sequence"
+msgstr "�� �������� ����� ���������� ��������"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr ""
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr ""
+
+#
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+msgid "invalid character reference: %s"
+msgstr "�� �������� ����� ���������� ��������"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+msgid "invalid entity reference: %s"
+msgstr "�� �������� ����� ���������� ��������"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr ""
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#
+#: libgettextpo/markup.c:1509
+#, fuzzy
+msgid "inside an attribute name"
+msgstr "������������ ��������"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: � ������� `--%s' ��� ��������� ���������\n"
+
+#
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: �� ������������ ������� `--%s'\n"
+
+#
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: �� �������� ������� -- %c\n"
+
+#
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: � ������� `-W %s' ����� �����������\n"
+
+#
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: � ������� `-W %s' ��� ��������� ���������\n"
+
+#
+#, fuzzy, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr ""
+#~ "%s: �������������: �� ������ ������� �������� �������������� �����������"
+
+#
+#, fuzzy, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
+
+#
+#, fuzzy, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "�� ����� `%s' ���� ����� ��� ������ �� ������� ����"
+
+#
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -3835,11 +4560,6 @@ msgstr ""
 #~ "������������ ��������� ����������: %s\n"
 
 #
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
-
-#
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "� �������� ��� ������ \"%s\", ���� %ld, �������"
 
@@ -3881,8 +4601,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 e4d70bc56..0d5a6b970 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -1,34 +1,35 @@
 # Mensajes en español para GNU gettext.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
-# Antonio Ceballos <aceballos@gmail.com>, 2013, 2014, 2015
+# Antonio Ceballos <aceballos@gmail.com>, 2013, 2014, 2015, 2016
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-22 17:59+0900\n"
-"PO-Revision-Date: 2015-12-31 00:56+0100\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-06-26 13:25+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "el argumento %s es inválido para %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "el argumento %s es ambiguo para %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Los argumentos válidos son:"
 
@@ -56,203 +57,187 @@ msgstr "no se puede borrar el directory temporal %s"
 msgid "write error"
 msgstr "error de escritura"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "preservando los permisos para %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "error al abrir el fichero %s para lectura"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, 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:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "error al leer %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "error al escribir %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fallo en fdopen()"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "No se encontró el compilador de C#, intente instalar pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "No se encontró la máquina virtual de C#, intente instalar pnet"
 
 # 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:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "fallo en el subproceso %s"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: la opción '%s' es ambigua; posibilidades:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción inválida -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la opción requiere un argumento -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, 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:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argumento source_version no válido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumento target_version no válido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
+msgstr ""
+"No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "No se encontró a la máquina virtual de Java, intente instalar gij o poner $JAVA"
+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:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "fallo al crear hilos de ejecución"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "fallo en la lectura del subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, 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"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "fallo en la comunicación con el subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subproceso %s terminó con un código de salida %d"
@@ -276,13 +261,13 @@ msgstr "el subproceso %s terminó con un código de salida %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "»"
 
@@ -291,64 +276,69 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "configurando permisos para %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "no se puede crear la tubería"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "fallo en _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "no se puede restaurar fd %d: fallo en dup2"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "subproceso %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s ha recibido una señal fatal %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "El elemento raíz debe ser <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "El elemento <%s> no contiene un elemento <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "El elemento <%s> no tiene un atributo <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pruebe '%s --help' para más información.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN...] [REGIÓN REGLAS]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -363,7 +353,7 @@ msgstr ""
 "para la REGIÓN en REGLAS y las imprime en un formato adecuado para gettext.\n"
 "Si no se pone ningún argumento, lee las reglas de plurales CLDR de la entradaestándar.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -372,27 +362,29 @@ 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/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  imprime las reglas de plurales en formato CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+msgstr ""
+"  -c, --cldr                  imprime las reglas de plurales en formato "
+"CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
@@ -401,25 +393,30 @@ msgstr "  -V, --version               muestra la versión y finaliza\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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -428,77 +425,82 @@ msgstr ""
 "Esto es software libre: es usted libre de cambiarlo y redistribuirlo.\n"
 "SIN NINGUNA GARANTÍA, dentro de los límites legales.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s no se puede leer"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "no se pueden extraer las reglas para %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "no se puede analizar la regla CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "operando extra %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "una especificación de formato para el argumento %u, como en '%s', no existe en '%s'"
+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 '%s'"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "las especificaciones de formato en '%s' y '%s' para el argumento %u no son las mismas"
+msgstr ""
+"las especificaciones de formato en '%s' y '%s' para el argumento %u no son "
+"las mismas"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "La instrucción número %u comienza con | pero no ternina con |."
@@ -506,59 +508,80 @@ msgstr "La instrucción número %u comienza con | pero no ternina con |."
 #: src/format.c:152
 #, 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 '%s'. Motivo: %s"
+msgstr ""
+"'%s' no es un formato de cadena válido %s, a diferencia de '%s'. Motivo: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "En la instrucción número %u, el token posterior a '<' no es el nombre de un macro especificador de formato. Los nombres de macro válidos están listados en el ISO C 99 sección 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"En la instrucción número %u, el token posterior a '<' no es el nombre de un "
+"macro especificador de formato. Los nombres de macro válidos están listados "
+"en el ISO C 99 sección 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "En la instrucción número %u, el token posterior a '<' no está seguido por '>'."
+msgstr ""
+"En la instrucción número %u, el token posterior a '<' no está seguido por "
+"'>'."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "La cadena se refiere al argumento número %u, pero ignora el argumento número %u."
+msgstr ""
+"La cadena se refiere al argumento número %u, pero ignora el argumento número "
+"%u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el número de especificaciones de formato en `%s' y '%s' no coincide"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "En la instrucción número %u, '{' no está seguido de un número de argumento."
+msgstr ""
+"En la instrucción número %u, '{' no está seguido de un número de argumento."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "En la instrucción número %u, ',' no está seguida de un número."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' correspondiente. "
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' "
+"correspondiente. "
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "La instrucción número %u termina con un carácter inválido '%c' en vez de un '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"La instrucción número %u termina con un carácter inválido '%c' en vez de un "
+"'}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "La instrucción número %u termina con un carácter inválido en vez de un '}'."
+msgstr ""
+"La instrucción número %u termina con un carácter inválido en vez de un '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "La cadena comienza en medio de una instrucción: se encontró un '}' sin su '{' correspondiente."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"La cadena comienza en medio de una instrucción: se encontró un '}' sin su "
+"'{' correspondiente."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La cadena contiene un '}' solitario posterior a la instrucción %u."
@@ -571,27 +594,38 @@ msgstr "En la instrucción número %u, la combinación de banderas no es válida
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "En la instrucción número %u, la precisión no está permitida antes de '%c'."
+msgstr ""
+"En la instrucción número %u, la precisión no está permitida antes de '%c'."
 
 #: 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 "En la instrucción número %u, el número de argumento de la precisión debe ser igual a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"En la instrucción número %u, el número de argumento de la precisión debe ser "
+"igual a %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "En la instrucción número %u, la especificación de la precisión no está permitida antes de '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"En la instrucción número %u, la especificación de la precisión no está "
+"permitida antes de '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "En la instrucción número %u, la especificación de la precisión no es válida."
+msgstr ""
+"En la instrucción número %u, la especificación de la precisión no es válida."
 
 #: 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'."
+msgstr ""
+"En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
 #: src/format-gcc-internal.c:677
 #, c-format
@@ -618,93 +652,145 @@ msgid "The string ends in the middle of a directive."
 msgstr "La cadena termina en medio de una instrucción."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-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."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+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-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "En la instrucción número %u, el número de argumento 0 no es un entero positivo."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"En la instrucción número %u, el número de argumento 0 no es un entero "
+"positivo."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "En la instrucción número %u, la anchura del argumento número 0 no es un entero positivo."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"En la instrucción número %u, la anchura del argumento número 0 no es un "
+"entero positivo."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "En la instrucción número %u, la precisión del argumento número 0 no es un entero positivo."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"En la instrucción número %u, la precisión del argumento número 0 no es un "
+"entero positivo."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "En la instrucción número %u, el carácter '%c' no es un especificador de conversión válido."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"En la instrucción número %u, el carácter '%c' no es un especificador de "
+"conversión válido."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "El carácter que termina la instrucción número %u no es un especificador de conversión válido."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"El carácter que termina la instrucción número %u no es un especificador de "
+"conversión válido."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "La cadena se refiere al número de argumento %u de formas incompatibles."
+msgstr ""
+"La cadena se refiere al número de argumento %u de formas incompatibles."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "En la instrucción número %u, la subcadena \"%s\" no está en un estilo de fecha/hora válido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"En la instrucción número %u, la subcadena \"%s\" no está en un estilo de "
+"fecha/hora válido."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "En la instrucción número %u, la subcadena \"%s\" no es un estilo de número válido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"En la instrucción número %u, la subcadena \"%s\" no es un estilo de número "
+"válido."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "En la instrucción número %u, el número de argumento no está seguido por una coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"En la instrucción número %u, el número de argumento no está seguido por una "
+"coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "En la instrucción número %u, una opción contiene un valor no numérico."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "En la instrucción número %u, una opción contiene un número que no está seguido por '<', '#' o '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"En la instrucción número %u, una opción contiene un número que no está "
+"seguido por '<', '#' o '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-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 '%s'"
+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 '%s'"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "las especificaciones de formato en '%s' y '%s' para el argumento {%u} no son las mismas"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"las especificaciones de formato en '%s' y '%s' para el argumento {%u} no son "
+"las mismas"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "La cadena se refiere al argumento número %u, pero no tiene en cuenta los argumento %u y %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"La cadena se refiere al argumento número %u, pero no tiene en cuenta los "
+"argumento %u y %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "una especificación de formato para los argumentos %u y %u no existe en '%s'; solo puede desestimarse un argumento"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"una especificación de formato para los argumentos %u y %u no existe en '%s'; "
+"solo puede desestimarse un argumento"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -715,15 +801,27 @@ msgstr "error al procesar: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "En la instrucción número %u, el parámetro %u es de tipo '%s', pero se requiere de un parámetro de tipo '%s'."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"En la instrucción número %u, el parámetro %u es de tipo '%s', pero se "
+"requiere de un parámetro de tipo '%s'."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "En la instrucción número %u se dieron demasiados parámetros; se espera a lo más %u parámetro."
-msgstr[1] "En la instrucción número %u se dieron demasiados parámetros; se esperan a lo más %u parámetros."
+msgid ""
+"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."
+msgstr[0] ""
+"En la instrucción número %u se dieron demasiados parámetros; se espera a lo "
+"más %u parámetro."
+msgstr[1] ""
+"En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
+"más %u parámetros."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -753,8 +851,12 @@ msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "En la instrucción número %u, '~:[' no está seguido de dos cláusulas separadas por '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"En la instrucción número %u, '~:[' no está seguido de dos cláusulas "
+"separadas por '~;'."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -773,161 +875,211 @@ msgstr "las especificaciones de formato en `%s' y '%s' no son equivalentes"
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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 las que hay en '%s'"
+msgstr ""
+"las especificaciones de formato en '%s' no son un subconjunto de las que hay "
+"en '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "En la instrucción número %u, el  tamaño del especificador es incompatible con el especificador de conversión '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"En la instrucción número %u, el  tamaño del especificador es incompatible "
+"con el especificador de conversión '%c'."
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "En la instrucción número %u, '%c' no puede iniciar un nombre de campo."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "En la instrucción número %u, '%c' no puede iniciar un argumento de getattr."
+msgstr ""
+"En la instrucción número %u, '%c' no puede iniciar un argumento de getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "En la instrucción número %u, '%c' no puede iniciar un argumento de getitem."
+msgstr ""
+"En la instrucción número %u, '%c' no puede iniciar un argumento de getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "En la instrucción número %u, no se permite más anidamiento en un especificador de formato."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"En la instrucción número %u, no se permite más anidamiento en un "
+"especificador de formato."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "En la instrucción número %u, hay una instrucción de formato inacabada."
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-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:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+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:355
+#: 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."
+msgstr ""
+"La cadena se refiere al argumento denominado '%s' en formas incompatibles."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "las especificaciones de formato en '%s' requieren una asociación, y aquellas en '%s' requieren una tupla"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"las especificaciones de formato en '%s' requieren una asociación, y aquellas "
+"en '%s' requieren una tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "las especificaciones de formato en '%s' requieren una tupla y aquellas en '%s' requieren una asociación"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"las especificaciones de formato en '%s' requieren una tupla y aquellas en "
+"'%s' requieren una asociación"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "una especificación de formato para el argumento '%s', como en '%s', no existe en '%s'"
+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 '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "las especificaciones de formato en '%s' y '%s' para el argumento '%s' no son las mismas"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"las especificaciones de formato en '%s' y '%s' para el argumento '%s' no son "
+"las mismas"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' es una cadena de formato simple, pero '%s' no lo es: contiene una bandera 'L' o un número de argumentos de dos dígitos"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' es una cadena de formato simple, pero '%s' no lo es: contiene una "
+"bandera 'L' o un número de argumentos de dos dígitos"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "La cadena se refiere a una variable de entorno con un nombre que no es ASCII."
+msgstr ""
+"La cadena se refiere a una variable de entorno con un nombre que no es ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "La cadena se refiere a una variable de entorno con una sintaxis compleja. Esta sintaxis no se admite aquí debido a potenciales problemas de seguridad."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"La cadena se refiere a una variable de entorno con una sintaxis compleja. "
+"Esta sintaxis no se admite aquí debido a potenciales problemas de seguridad."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "La cadena se refiere a una variable de entorno cuyo valor podría ser distinto dentro de las funciones del intérprete de comandos."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"La cadena se refiere a una variable de entorno cuyo valor podría ser "
+"distinto dentro de las funciones del intérprete de comandos."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "La cadena se refiere a una variable de entorno con un nombre vacío."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "En la instrucción número %u, el carácter '%c' no es un dígito entre 1 y 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+"En la instrucción número %u, el carácter '%c' no es un dígito entre 1 y 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Muestra el nombre de la máquina.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato de salida:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nombre de corto de la máquina\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"   -f, --fqdn, --long          nombre largo de la máquina, incluye el nombre\n"
+"   -f, --fqdn, --long          nombre largo de la máquina, incluye el "
+"nombre\n"
 "                               completo del dominio y los alias,\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address            direcciones para el nombre de la máquina\n"
+msgstr ""
+"  -i, --ip-address            direcciones para el nombre de la máquina\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "no se pudo obtener el nombre de la máquina"
@@ -937,7 +1089,7 @@ msgstr "no se pudo obtener el nombre de la máquina"
 msgid "selector is not specified"
 msgstr "no se ha especificado selector"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "no se puede crear el contexto XPath"
@@ -947,28 +1099,28 @@ msgstr "no se puede crear el contexto XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "no se puede evaluar la expresión XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "el nodo \"%s\" no contiene \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "el valor del atributo \"%s\" no es válido para \"%s\""
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "el elemento raíz no es \"rules\" en el espacio de nombres %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "no se puede leer %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "no se puede evaluar la ruta en la que está ubicado el XPath: %s"
@@ -988,28 +1140,28 @@ msgstr "no se puede leer el fichero XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "el elemento raíz no es \"locatingRules\""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "solo se permite un fichero de entrada máximo"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1018,63 +1170,71 @@ 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:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Los argumentos obligatorios para las opciones largas también son obligatorios para las opciones cortas.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Los argumentos obligatorios para las opciones largas también son "
+"obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localización del fichero de entrada:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHEROENTRADA              fichero PO de entrada\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=DIRECTORIO  añade al DIRECTORIO a la lista de búsqueda de ficheros\n"
+"  -D, --directory=DIRECTORIO  añade al DIRECTORIO a la lista de búsqueda de "
+"ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Si no se especifica un fichero de entrada o si es -, se lee la entrada "
+"estándar.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localización del fichero de salida:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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"
+msgstr ""
+"  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1083,254 +1243,318 @@ 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:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaje:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            mantiene lo traducido, elimina los mensajes sin traducir\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            mantiene lo traducido, elimina los mensajes "
+"sin traducir\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          mantiene lo no traducido, elimina los mensajes traducidos\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          mantiene lo no traducido, elimina los mensajes "
+"traducidos\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              elimina los mensajes difusos marcados como 'fuzzy'\n"
+msgstr ""
+"      --no-fuzzy              elimina los mensajes difusos marcados como "
+"'fuzzy'\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            mantiene los mensajes difusos marcados con 'fuzzy'\n"
+msgstr ""
+"      --only-fuzzy            mantiene los mensajes difusos marcados con "
+"'fuzzy'\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulación de atributos:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
+msgstr ""
+"      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           marca todos los mensajes como no difusos (no-'fuzzy')\n"
+msgstr ""
+"      --clear-fuzzy           marca todos los mensajes como no difusos "
+"(no-'fuzzy')\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          marca todos los mensajes como obsoletos\n"
+msgstr ""
+"      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
+msgstr ""
+"      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              cuando se configura 'fuzzy', mantiene los msgids\n"
+"      --previous              cuando se configura 'fuzzy', mantiene los "
+"msgids\n"
 "                              anteriores de los mensajes traducidos.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        elimina el \"msgid anterior\" de todos los mensajes\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        elimina el \"msgid anterior\" de todos los "
+"mensajes\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 cuando elimina los mensajes difusos 'fuzzy', también deja msgstr vacío\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 cuando elimina los mensajes difusos 'fuzzy', "
+"también deja msgstr vacío\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=FICHERO.po  manipula solo las entradas que se encuentran en FICHERO.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FICHERO.po  manipula solo las entradas que se encuentran "
+"en FICHERO.po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=FICHERO.po  manipula solo las entradas no listadas en FICHERO.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FICHERO.po  manipula solo las entradas no listadas en "
+"FICHERO.po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxis del fichero de entrada:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      el fichero de entrada sigue la misma sintaxis que .properties de Java\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      el fichero de entrada sigue la misma sintaxis "
+"que .properties de Java\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     el fichero de entrada sigue la sintaxis de .strings de NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     el fichero de entrada sigue la sintaxis de ."
+"strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
-"      --color                 utiliza siempre colores y otros atributos de texto\n"
-"      --color=CUANDO          utiliza colores y otros atributos de texto si se cumple CUANDO.\n"
+"      --color                 utiliza siempre colores y otros atributos de "
+"texto\n"
+"      --color=CUANDO          utiliza colores y otros atributos de texto si "
+"se cumple CUANDO.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=FICHEROESTILO   especifica fichero de reglas de estilo CSS para --color\n"
+msgstr ""
+"      --style=FICHEROESTILO   especifica fichero de reglas de estilo CSS "
+"para --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             no utiliza escapes de C en la salida (por omisión)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             no utiliza escapes de C en la salida (por "
+"omisión)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                utiliza escapes de C en la salida, sin caracteres extendidos\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                utiliza escapes de C en la salida, sin "
+"caracteres extendidos\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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"
+msgstr ""
+"      --force-po              escribe un fichero PO aún si está vacío\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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"
+msgstr ""
+"  -i, --indent                escribe el fichero .po utilizando estilo con "
+"sangrados\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           no escribe las líneas '#: fichero:línea'\n"
+msgstr ""
+"      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, 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"
+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:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                escribe un fichero .po con Uniforum estricto\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    escribe un fichero .strings de NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    escribe un fichero .strings de NeXTstep/"
+"GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               no divide a las líneas de los mensajes, aunque\n"
-"                              sean mayores a la anchura de la página de salida\n"
+"      --no-wrap               no divide a las líneas de los mensajes, "
+"aunque\n"
+"                              sean mayores a la anchura de la página de "
+"salida\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          ordena la salida por ubicación de fichero\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1354,41 +1578,46 @@ msgstr ""
 "se especifica --use-first, en cuyo caso serán tomados del primer\n"
 "fichero PO para definirlos.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHEROENTRADA ...          ficheros de entrada\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=FICHERO    obtiene una lista de ficheros de entrada del "
+"FICHERO\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:409 src/msgcomm.c:400
+#: 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 ""
-"  -<, --less-than=NÚMERO      imprime los mensajes con menos que este NÚMERO de \n"
-"                              definiciones; si no se especifica, es infinito\n"
+"  -<, --less-than=NÚMERO      imprime los mensajes con menos que este NÚMERO "
+"de \n"
+"                              definiciones; si no se especifica, es "
+"infinito\n"
 
-#: src/msgcat.c:412
+#: 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 ""
-"  ->, --more-than=NÚMERO      imprime los mensajes con más de este NÚMERO de\n"
+"  ->, --more-than=NÚMERO      imprime los mensajes con más de este NÚMERO "
+"de\n"
 "                              definiciones; si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1397,14 +1626,17 @@ msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
 "                              que solo se impriman los mensajes únicos\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      los ficheros de entrada siguen la misma sintaxis que .properties de Java\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      los ficheros de entrada siguen la misma "
+"sintaxis que .properties de Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1413,12 +1645,12 @@ msgstr ""
 "      --stringtable-input     los ficheros de entrada están en la sintaxis\n"
 "                              .strings de NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOMBRE        codificación de la salida\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1427,27 +1659,29 @@ msgstr ""
 "      --use-first             utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NOMBRECATALOGO   pone el campo 'Language' en la cabecera\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=NOMBRECATALOGO   pone el campo 'Language' en la cabecera\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "no se especificaron ficheros de entrada"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "se requieren exactamente 2 ficheros de entrada"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1512,7 +1746,7 @@ msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
 # 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:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1531,71 +1765,74 @@ 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:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traducciones\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referencias a las fuentes\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operación:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr ""
 "  -m, --multi-domain          aplica ref.pot a cada uno de los dominios en\n"
 "                              def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             utiliza entradas difusas para la salida\n"
+msgstr ""
+"      --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --use-untranslated      utiliza las entradas no traducidas\n"
 "traducidos\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "este mensaje no está traducido"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "este mensaje debe ser revisado por el traductor"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "este mensaje se usa pero no está definido..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...pero esta definición es parecida"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atención: este mensaje no se utiliza"
@@ -1621,19 +1858,19 @@ msgstr "atención: este mensaje no se utiliza"
 #
 # 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:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "se encontró %d error fatal"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:317
+#: 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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1656,76 +1893,87 @@ msgstr ""
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
 "acumularán.\n"
 
-#: src/msgcomm.c:403
+#: 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 ""
-"  ->, --more-than=NÚMERO      muestra los mensajes cuyo número de definiciones\n"
+"  ->, --more-than=NÚMERO      muestra los mensajes cuyo número de "
+"definiciones\n"
 "                              sea mayor que NÚMERO; si no se pone,\n"
 "                              el valor por omisión es 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           no escribe la línea de encabezado con la entrada 'msgid \"\"'\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           no escribe la línea de encabezado con la "
+"entrada 'msgid \"\"'\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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 caracteres distinta.\n"
+msgstr ""
+"Convierte un catálogo de traducción a una codificación de caracteres "
+"distinta.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Objetivo de conversión:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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"
+msgstr ""
+"La codificación por omisión es la que está en uso por la funcion locale.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                estilo de salida con sangrías\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           no escribe las líneas '#: fichero:línea'\n"
+msgstr ""
+"      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          genera líneas '#: fichero:línea' (por omisión)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          genera líneas '#: fichero:línea' (por "
+"omisión)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, 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:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "no se especificó el fichero de entrada"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "se requiere exactamente un fichero de entrada"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1738,22 +1986,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:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHEROENTRADA              fichero de entrada PO o POT\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "Se omitió el nombre de la instrucción"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, 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:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1769,7 +2017,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1778,47 +2026,49 @@ msgstr ""
 "Una instrucción especial llamada '0' genera la traducción, seguido de un byte nulo.\n"
 "La salida de \"msgexec 0\" se puede utilizar como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Entrada de órdenes:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   añade una nueva línea al final de la entrada\n"
+msgstr ""
+"  --newline                   añade una nueva línea al final de la entrada\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero PO de entrada\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "fallo en la escritura a la salida estándar"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "falta el nombre del filtro"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, 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:414
+#: src/msgfilter.c:413
 #, 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:418
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1827,68 +2077,77 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Entrada y salida del filtro:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
 msgstr ""
-"  --newline                   añade una nueva línea al final de la entrada y\n"
-"                                elimina una nueva línea del final de la salida"
+"  --newline                   añade una nueva línea al final de la entrada "
+"y\n"
+"                                elimina una nueva línea del final de la "
+"salida"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=GUIÓN      añade un GUIÓN a las instrucciones que serán\n"
 "                              ejecutadas\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=FICHEROGUIÓN     añade el contenido del FICHEROGUIÓN a las\n"
 "                              instrucciones que serán ejecutadas\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       elimina la impresión automática del espacio\n"
 "                              de patrones\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             no utiliza las secuencias de escape tipo C\n"
 "                              en la salida (por omisión)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                escribe el fichero .po utilizando sangrías\n"
+msgstr ""
+"      --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           conserva la línea de encabezado sin modificación,\n"
+"      --keep-header           conserva la línea de encabezado sin "
+"modificación,\n"
 "                              es decir, no la filtra\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "la salida del filtro no termina con una nueva línea"
@@ -1904,7 +2163,7 @@ msgid "invalid endianness: %s"
 msgstr "«Endianness» no válida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1913,14 +2172,14 @@ msgstr "Ulrich Drepper"
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no debería especificarse fichero de entrada si se especifican %s y %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: 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 locale\""
@@ -1940,7 +2199,7 @@ msgstr "%s requiere que se especifique un \"-o fichero\""
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s y %s son mutuamente excluyentes en %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s solo es válido con %s o %s"
@@ -1950,141 +2209,169 @@ msgstr "%s solo es válido con %s o %s"
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s solo es válido con %s, %s o %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "no se pueden ubicar las reglas ITS para %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:881
 #, 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:898
+#: src/msgfmt.c:886
 #, 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:918
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:910
 #, 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"
+msgstr ""
+"Genera un catálogo binario de mensajes a partir de la descripción de la "
+"traducción textual.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...              ficheros de entrada\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Modo Java: la entrada es una clase de Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Modo Java: la entrada es una clase de Java "
+"ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                Modo C#: genera un fichero .dll de .NET\n"
+msgstr ""
+"      --csharp                Modo C#: genera un fichero .dll de .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      modo de recursos C#: genera un fichero .resources de .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      modo de recursos C#: genera un fichero ."
+"resources de .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Modo tcl: genera un fichero .msg tcl/msgcat\n"
+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:953
+#: src/msgfmt.c:941
 #, 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:955
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Modo entrada de escritorio: genera un fichero .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Modo entrada de escritorio: genera un fichero ."
+"desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   Modo XML: genera un fichero XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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:969
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localización del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                produce un fichero .java en lugar de un fichero .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                produce un fichero .java en lugar de un "
+"fichero .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
+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:979
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -2092,38 +2379,43 @@ 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:985
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localización del fichero de salida en modo C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d DIRECTORIO               directorio base de los ficheros .dll de dependencias locales\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DIRECTORIO               directorio base de los ficheros .dll de "
+"dependencias locales\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:981
 #, 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 ""
 "Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
-"un subdirectorio del directorio especificado cuyo nombre dependerá de la localización.\n"
+"un subdirectorio del directorio especificado cuyo nombre dependerá de la "
+"localización.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localización del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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:1003
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2132,176 +2424,192 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opciones del modo de entrada de escritorio:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=PLANTILLA        un fichero .desktop utilizado como plantilla\n"
+msgstr ""
+"  --template=PLANTILLA        un fichero .desktop utilizado como plantilla\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORIO               directorio base de los ficheros .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"  -kWORD, --keyword=PALABRA   busca PALABRA a modo de palabra clave adicional\n"
+"  -kWORD, --keyword=PALABRA   busca PALABRA a modo de palabra clave "
+"adicional\n"
 "  -k, --keyword               no usa las palabras clave por omisión\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Las opciones -l, -o y --template son obligatorias. Si se especifica -D, los ficheros de\n"
-"entrada se leen del directorio en lugar de los argumentos de la línea de órdenes.\n"
+"Las opciones -l, -o y --template son obligatorias. Si se especifica -D, los "
+"ficheros de\n"
+"entrada se leen del directorio en lugar de los argumentos de la línea de "
+"órdenes.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Opciones del modo XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L  --language=NOMBRE       reconoce el lenguaje XML especificado\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=PLANTILLA        fichero XML utilizado como plantilla\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretación del fichero de entrada:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 hace todas las revisiones implicadas por\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
-"      --check-format          revisa las cadenas de formato dependientes del\n"
+"      --check-format          revisa las cadenas de formato dependientes "
+"del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
 "                              línea de encabezado\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          revisa si hay conflictos entre las instrucciones\n"
+"      --check-domain          revisa si hay conflictos entre las "
+"instrucciones\n"
 "                              del dominio y la opción --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   revisa si el msgfmt de GNU se comporta como el\n"
+"  -C, --check-compatibility   revisa si el msgfmt de GNU se comporta como "
+"el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CAR]   revisa la presencia de aceleradores de\n"
 "                                   teclado para los elementos del menú\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
+msgstr ""
+"  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "   -a, --alignment=NÚMERO      alinea las cadenas al NÚMERO de bytes\n"
 "                               (por omisión es: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=ORDENBYTES escribe números de 32 bits en el orden de bytes especificado\n"
-"                                (que el «endianness» predefinido sea «big» o «little» depende de la plataforma)\n"
+"      --endianness=ORDENBYTES escribe números de 32 bits en el orden de "
+"bytes especificado\n"
+"                                (que el «endianness» predefinido sea «big» o "
+"«little» depende de la plataforma)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               el fichero binario no incluirá la tabla de hash\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               el fichero binario no incluirá la tabla de "
+"hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            muestra las estadísticas sobre las traducciones\n"
+msgstr ""
+"      --statistics            muestra las estadísticas sobre las "
+"traducciones\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta la cantidad de mensajes\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1185
 #, 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:1202
+#: src/msgfmt.c:1187
 #, 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:1212
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "atención: el encabezado del fichero PO está difuso\n"
-
-#: src/msgfmt.c:1214
-#, 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:1238
+#: src/msgfmt.c:1211
 #, 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:1243
+#: src/msgfmt.c:1216
 #, 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:1257
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "la instrucción 'domain %s' no tiene efecto"
@@ -2310,50 +2618,55 @@ msgstr "la instrucción 'domain %s' no tiene efecto"
 # 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:1317
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "se descarta la línea vacía 'msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "se descarta la línea difusa 'msgstr'"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s no existe"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe pero no se puede leer"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "la opción '%c' no se puede usar antes de que 'J', 'K', 'T', 'C' o 'X' hayan sido especificadas"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"la opción '%c' no se puede usar antes de que 'J', 'K', 'T', 'C' o 'X' hayan "
+"sido especificadas"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2362,7 +2675,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2447,34 +2760,44 @@ msgstr ""
 "  -v, --invert-match           muestra solo quellos mensajes que no coinciden con\n"
 "                               ningún criterio de selección\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                utiliza escapes C en la salida, sin caracteres\n"
+"      --escape                utiliza escapes C en la salida, sin "
+"caracteres\n"
 "                              extendidos\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera una salida ordenada\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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"
+msgstr ""
+"      --sort-by-file          ordena la salida por localización de ficheros\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
-"Se encuentra en un entorno indiferente al idioma. Por favor ponga su variable\n"
+"Se encuentra en un entorno indiferente al idioma. Por favor ponga su "
+"variable\n"
 "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:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2485,12 +2808,12 @@ msgstr ""
 "Especifique 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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creado %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2499,26 +2822,28 @@ msgstr ""
 "Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
 "tomados del entorno del usuario.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 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:386
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2528,50 +2853,56 @@ msgstr ""
 "de la selección local del usuario. Si es -, los resultados se escriben en\n"
 "la salida estándar.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          configura el locale de destino\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         supone que el fichero PO será generado\n"
 "                              automáticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Se ha encontrado más de un fichero .pot\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opción --input\n"
+"Favor de especificar el fichero .pot de entrada utilizando la opción --"
+"input\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "error en la lectura del directorio actual"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "No se encuentra el fichero .pot en el directorio actual.\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opción --input\n"
+"Favor de especificar el fichero .pot de entrada utilizando la opción --"
+"input\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, 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:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "El nuevo catálogo de mensajes debería contener su dirección de correo \n"
@@ -2582,44 +2913,57 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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"
+msgstr ""
+"el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
+"portátil"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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"
+msgstr ""
+"hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
+"entrada"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "el fichero de entrada '%s' no contiene una línea de encabezado con la especificación del conjunto de caracteres"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+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:208
+#: 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 dominio \"%s\" en el fichero de entrada '%s' no contiene una línea de encabezado con la especificación del conjunto de caracteres"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"el dominio \"%s\" en el fichero de entrada '%s' no contiene una línea de "
+"encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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."
+msgstr ""
+"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
+"portátil."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "atención: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2628,10 +2972,11 @@ 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:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2639,7 +2984,7 @@ msgstr ""
 "%s y %s entre otras.\n"
 "Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2650,9 +2995,10 @@ msgstr ""
 "La conversión del fichero %s de la codificación %s a la codificación %s\n"
 "altera algunos msgids o msgctxts.\n"
 "Bien cambie todos los msgids y msgctxts a ASCII puro, bien asegúrese de que\n"
-"estén codificados en UTF-8 desde el principio, es decir, en sus ficheros de código fuente.\n"
+"estén codificados en UTF-8 desde el principio, es decir, en sus ficheros de "
+"código fuente.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2665,12 +3011,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:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2681,7 +3027,7 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2694,85 +3040,96 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"El conjunto de caracteres local \"%s\" no es un nombre de codificación portátil.\n"
+"El conjunto de caracteres local \"%s\" no es un nombre de codificación "
+"portátil.\n"
 "La salida de '%s' podría ser incorrecta.\n"
 "Una alternativa posible s poner LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu pero las expresiones plurales pueden producir valores tan "
+"grades como %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir desbordamiento de número entero"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "la expresión plural puede producir excepciones aritméticas, posiblemente una división por cero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"la expresión plural puede producir excepciones aritméticas, posiblemente una "
+"división por cero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, 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 solo tienen una forma plural"
 msgstr[1] "pero algunos mensajes solo tienen %lu formas plurales"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, 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 una forma plural"
 msgstr[1] "pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgl-check.c:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "el catálogo de mensajes tiene traducciones con formas plurales, pero no tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIÓN;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"el catálogo de mensajes tiene traducciones con formas plurales, pero no "
+"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIÓN;\""
 
 # ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
 # Bien. Mejora. mm
@@ -2810,7 +3167,7 @@ msgstr "las líneas 'msgid' y 'msgid_plural' no comienzan ambas con '\\n'"
 # 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:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr[%u]' no comienzan ambas con '\\n'"
@@ -2843,7 +3200,7 @@ msgstr "las líneas 'msgid' y 'msgid_plural' no terminan ambas con '\\n'"
 
 # 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:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr[%u]' no terminan ambas con '\\n'"
@@ -2858,85 +3215,105 @@ msgstr "las líneas 'msgid' y 'msgstr' no terminan ambas con '\\n'"
 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:734
+#: src/msgl-check.c:733
 #, 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:745
+#: src/msgl-check.c:744
 #, 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:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "el campo de cabecera '%s' aún tiene el valor inicial por omisión\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "el campo '%s' no está presente en la cabecera\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "puntos suspensivos ASCII ('...') en lugar de Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "se ha encontrado un espacio delante de unos puntos suspensivos en cadenas\n"
 "que el usuario puede ver"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "se han utilizado comillas dobles ASCII en lugar de Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "se han utilizado comillas simples ASCII en lugar de Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "viñeta ASCII ('%c') en lugar de Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: la entrada no es válida con la codificación \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: error al convertir de la codificación \"%s\" a la codificación \"%s\""
+msgstr ""
+"%s: error al convertir de la codificación \"%s\" a la codificación \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"El fichero de entrada no contiene una línea de encabezado que especifique el "
+"conjunto de caracteres"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv() no soporta este tipo de conversión."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv() "
+"no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid distintos se vuelven iguales."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
+"distintos se vuelven iguales."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(). Esta versión fue construida sin iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(). Esta "
+"versión fue construida sin iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s solo es válido con %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tipo de respaldo"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2959,26 +3336,29 @@ msgstr ""
 "haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
 "para obtener mejores resultados.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      traducciones que se refieren a las viejas fuentes\n"
+msgstr ""
+"  def.po                      traducciones que se refieren a las viejas "
+"fuentes\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencias a las nuevas fuentes\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FICHERO    biblioteca adicional de traducción de mensajes,\n"
+"  -C, --compendium=FICHERO    biblioteca adicional de traducción de "
+"mensajes,\n"
 "                              puede ser especificada más de una vez\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2987,30 +3367,31 @@ msgstr ""
 "   -U, --update                actualiza def.po,\n"
 "                               no hace nada si def.po ya está actualizado\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, 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:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "El resultado se escribió sobre def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIJO         sobreescribe el sufijo de respaldo\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -3022,130 +3403,159 @@ msgstr ""
 "Estos son los valores permitidos:\n"
 "   none, off       nunca hace respaldos (aún si se especifica --backup)\n"
 "   numbered, t     hace respaldos numerados\n"
-"   existing, nil   numerados si existen los backups numerados, o sencillos si\n"
+"   existing, nil   numerados si existen los backups numerados, o sencillos "
+"si\n"
 "                   no es así\n"
 "   simple, never   siempre hace backups sencillos\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 reconoce los formatos de cadena Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              conserva los msgids anteriores de los mensajes traducidos\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              conserva los msgids anteriores de los mensajes "
+"traducidos\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime los indicadores de progreso\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "este mensaje debería definir las formas plurales"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "este mensaje no debería definir las formas plurales"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 "%sleídos %ld mensajes antiguos + %ld mensajes de referencia\n"
 "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
 
 # Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " terminado.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
+"po.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java \n"
 "                              ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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"
+msgstr ""
+"      --csharp                Modo C#: la entrada es un fichero .dll de ."
+"NET\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      modo de recursos C#: genera un fichero .resources de .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      modo de recursos C#: genera un fichero ."
+"resources de .NET\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/"
+"msgcat\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHERO ...                 ficheros .mo de entrada\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
 "recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
 "variable de entorno CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: 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 ""
 "Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
-"un subdirectorio del directorio especificado cuyo nombre depende de la configuración local.\n"
+"un subdirectorio del directorio especificado cuyo nombre depende de la "
+"configuración local.\n"
 
-#: src/msgunfmt.c:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3154,17 +3564,18 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgunfmt.c:512
+#: 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"
+msgstr ""
+"  -i, --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3187,17 +3598,21 @@ msgstr ""
 "ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
 "duplicados se descartan.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                muestra solo los mensajes únicos, descarta los duplicados\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                muestra solo los mensajes únicos, descarta los "
+"duplicados\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3209,7 +3624,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "El conjunto de caracteres \"%s\" no es un nombre de codificación portátil.\n"
-"La conversión de mensajes al conjunto de caracteres del usuario podría no funcionar.\n"
+"La conversión de mensajes al conjunto de caracteres del usuario podría no "
+"funcionar.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -3251,34 +3667,35 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "No hay un conjunto de caracteres especificado en el encabezado.\n"
-"La conversión de mensajes al conjunto de caracteres del usuario no funcionará.\n"
+"La conversión de mensajes al conjunto de caracteres del usuario no "
+"funcionará.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "la sección 'msgstr[]' no está presente"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "la sección 'msgid_plural' no está presente"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "la sección 'msgstr' no está presente"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la primera forma del plural tiene un índice distinto de cero"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la primera forma del plural tiene un índice incorrecto"
@@ -3321,7 +3738,7 @@ msgstr "la primera forma del plural tiene un índice incorrecto"
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sucesión de multibyte inválida"
@@ -3331,36 +3748,36 @@ msgstr "sucesión de multibyte inválida"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sucesión de multibyte inválida al final del fichero"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, 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:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave \"%s\" desconocida"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de fichero dentro de una cadena"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separador de contexto <EOT> dentro de una cadena"
@@ -3396,7 +3813,7 @@ msgstr "separador de contexto <EOT> dentro de una cadena"
 # 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:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
@@ -3418,48 +3835,64 @@ msgstr "nombre de grupo sin terminar"
 msgid "invalid non-blank character"
 msgstr "carácter «no espacio» no válido"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "falta '=' después de \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "línea «no vacía» no válida"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "el fichero \"%s\" está truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "atención: sintaxis \\uxxxx no válida para carácter Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: atención: sustitución aislada U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "atención: carácter Unicode inválido"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "atención: cadena no finalizada"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "atención: error de sintaxis"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "atención: par llave/valor no finalizado"
 
@@ -3467,11 +3900,12 @@ msgstr "atención: par llave/valor no finalizado"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "atención: error de sintaxis; se espera un ';' después de la cadena"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "atención: error de sintaxis; se espera un '=' o un ';' después de la cadena"
+msgstr ""
+"atención: error de sintaxis; se espera un '=' o un ';' después de la cadena"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s y %s.\n"
@@ -3480,16 +3914,16 @@ msgstr "Escrito por %s y %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recodifica el texto serbio de escritura cirílica a latina.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3498,27 +3932,27 @@ msgstr ""
 "El fichero de entrada se lee de la entrada estándar.  El texto convertido se saca por\n"
 "la salida estándar.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "la entrada no es válida con la codificación \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error al convertir de la codificación \"%s\" a la codificación \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "se esperan dos argumentos"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3527,111 +3961,137 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "error al escribir la salida estándar"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error después de leer \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Recuperando %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " tiempo agotado.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " ha fallado.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "No se pueden mostrar varios dominios de traducción en un solo fichero con el formato de salida especificado. Intente usar la sintaxis de los ficheros PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
+"formato de salida especificado. Intente usar la sintaxis de los ficheros PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "No se pueden mostrar varios dominios de traducción en un solo fichero con el formato de salida especificado."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
+"formato de salida especificado."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "el catálogo de mensajes tiene traducciones que dependen del contexto, pero el formato de salida no las admite."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el formato de salida no las admite."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "el catálogo de mensajes tiene traducciones en forma plural, pero el formato de salida no lo soporta. Se puede intentar generar una clase Java utilizando \"msgfmt --java\" en vez del fichero de propiedades."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"el catálogo de mensajes tiene traducciones en forma plural, pero el formato "
+"de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
+"\"msgfmt --java\" en vez del fichero de propiedades."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-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:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+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:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "salida estándar"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "fallo al crear el directorio \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, 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:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "fallo en la compilación de la clase C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1096
 #, 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:1211
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "fallo en la compilación de la clase Java, intente poner $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "sucesión de multibyte incompleta"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "Los mensajes internacionalizados no deben contener la secuencia de escape '\\%c'"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"Los mensajes internacionalizados no deben contener la secuencia de escape '\\"
+"%c'"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3644,7 +4104,7 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgctxt\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3667,11 +4127,13 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"el catálogo de mensajes tiene cadenas msgctxt que contienen caracteres fuera del ISO-8859-1,\n"
+"el catálogo de mensajes tiene cadenas msgctxt que contienen caracteres fuera "
+"del ISO-8859-1,\n"
 "pero el formato del catálogo de mensajes de Qt admite Unicode\n"
 "solo en las cadenas traducidas, no en las cadenas del contexto\n"
 
@@ -3686,20 +4148,21 @@ msgstr ""
 "admite Unicode solo en las cadenas traducidas, no en las que aún\n"
 "no lo están\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "hubo un error al escribir al subproceso %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones que dependen del contexto, pero el \n"
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el \n"
 "formato de los recursos de C# no admite contextos\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3707,15 +4170,16 @@ 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-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"el catálogo de mensajes tiene traducciones que dependen del contexto, pero el \n"
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el \n"
 "catálogo de mensajes de Tcl no admite contextos\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3723,36 +4187,56 @@ 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-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, 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:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "atención: carácter Unicode inválido"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: atención: carácter Unicode inválido"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: atención: literal de cadena no finalizada"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: atención: literal de cadena no finalizada"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, 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:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Especifique la codificación del código fuente utilizando --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3761,7 +4245,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:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3770,7 +4254,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:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3779,7 +4263,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:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3788,12 +4272,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:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3802,128 +4286,152 @@ 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:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: atención: carácter Unicode inválido"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: atención: cadena constante no finalizada"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, 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:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "'%s' no es un nombre de codificación válido.  Se utilizará ASCII en su lugar.\n"
+msgstr ""
+"'%s' no es un nombre de codificación válido.  Se utilizará ASCII en su "
+"lugar.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "comprobación de sintaxis '%s' desconocida"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "tipo de fin de instrucción '%s' desconocido"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:701
 #, 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:716
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "atención: el fichero de reglas ITS '%s' no existe"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "atención: el fichero de reglas ITS '%s' no existe; compruebe su instalación de gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"atención: el fichero de reglas ITS '%s' no existe; compruebe su instalación "
+"de gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:938
 #, 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:1052
+#: src/xgettext.c:1027
 #, 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"
+msgstr ""
+"Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 "  -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
 "                              mensajes.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
+msgstr ""
+"  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        los ficheros de salida se pondrán en el\n"
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:1084
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:1086
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NOMBRE       reconoce el lenguaje especificado\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero de entrada.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
+"de entrada.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3932,46 +4440,53 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1078
 #, 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"
+msgstr ""
+"Por omisión, los ficheros de entrada se presupone que están en ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         une los mensajes con un fichero existente\n"
+msgstr ""
+"  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=FICHERO.po  las líneas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=ETIQUETA  coloca los bloques de comentarios iniciándolos con ETIQUETA y \n"
-"                                delante de las líneas de palabras clave en el fichero de salida\n"
-"  -c, --add-comments          coloca todos los bloques de comentarios delante de las líneas de palabras clave\n"
+"  -cTAG, --add-comments=ETIQUETA  coloca los bloques de comentarios "
+"iniciándolos con ETIQUETA y \n"
+"                                delante de las líneas de palabras clave en "
+"el fichero de salida\n"
+"  -c, --add-comments          coloca todos los bloques de comentarios "
+"delante de las líneas de palabras clave\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOMBRE          comprueba la sintaxis de los mensajes\n"
 "                                (puntos suspensivos unicode, espacio\n"
 "                                 delante de puntos suspensivos,\n"
-"                                 comillas unicode)\n"
+"                                 comillas unicode, viñetas unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3982,249 +4497,210 @@ msgstr ""
 "                                (predefinido un espacio sencillo, \n"
 "                                 o un espacio doble)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opciones específicas del lenguaje:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (solo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (solo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=PALABRA:ARG:BANDERA  bandera adicional para las cadenas que están\n"
-"                                  dentro del argumento número ARG de la palabra\n"
+"      --flag=PALABRA:ARG:BANDERA  bandera adicional para las cadenas que "
+"están\n"
+"                                  dentro del argumento número ARG de la "
+"palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (solo los lenguajes C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (solo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1126
 #, 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:1153
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (solo en lenguajes C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (solo en lenguajes C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"      --its=FICHERO           aplica las reglas ITS obtenidas de FICHERO\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (solo lenguajes basados en XML)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo lenguaje C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   reconoce los 4 formatos de cadena KDE\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 reconoce los formatos de cadena Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 muestra con más detalle el resultado del reconocimiento\n"
+"      --debug                 muestra con más detalle el resultado del "
+"reconocimiento\n"
 "                              de las cadenas de formato\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1171
 #, 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:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=FICHERO           aplica las reglas ITS obtenidas de FICHERO\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               escribe comentarios itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1188
 #, 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"
+msgstr ""
+"      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PAQUETE  pone el nombre del paquete en la salida\n"
+msgstr ""
+"      --package-name=PAQUETE  pone el nombre del paquete en la salida\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  pone la versión del paquete en la salida\n"
+msgstr ""
+"      --package-version=VERSION  pone la versión del paquete en la salida\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[CADENA], --msgstr-prefix[=CADENA]  utiliza CADENA o \"\" como prefijo para las\n"
+"  -m[CADENA], --msgstr-prefix[=CADENA]  utiliza CADENA o \"\" como prefijo "
+"para las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[CADENA], --msgstr-suffix[=CADENA]  utiliza CADENA o \"\" como sufijo para las\n"
+"  -M[CADENA], --msgstr-suffix[=CADENA]  utiliza CADENA o \"\" como sufijo "
+"para las\n"
 "                                líneas del msgstr\n"
 
-#: src/xgettext.c:2050
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Un argumento --flag no tiene la sintaxis <palabraclave>:<númarg>:[pass-]<bandera>: %s"
-
-#: src/xgettext.c:2175
-msgid "standard input"
-msgstr "entrada estándar"
-
-#: src/xgettext.c:2340
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Carácter no ASCII en %s%s."
-
-#: src/xgettext.c:2344
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Comentario no ASCII en o precediendo %s%s."
-
-#: src/xgettext.c:2349
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Cadena no ASCII en %s%s."
-
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: atención: "
-
-#: src/xgettext.c:2458
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-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:2459
-#, c-format
-msgid "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:2490
+#: src/xgettext.c:1597
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"la cadena de formato '%s' con argumentos sin nombre no se puede localizar adecuadamente:\n"
-"El traductor no puede reordenar los argumentos.\n"
-"Considere la opción de usar una cadena de formato con argumentos con nombre\n"
-"y una asociación en lugar de una tupla para los argumentos.\n"
+"Un argumento --flag no tiene la sintaxis <palabraclave>:<númarg>:"
+"[pass-]<bandera>: %s"
 
-#: src/xgettext.c:2555
-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 ""
-"msgid vacío. Está reservado por el gettext de GNU:\n"
-"gettext(\"\") regresa la línea de encabezado con la\n"
-"metainformación, no una cadena vacía.\n"
-
-#: src/xgettext.c:3292
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "la especificación de argumento es ambigua para la palabra clave '%.*s'"
-
-#: src/xgettext.c:3319
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
-
-#: src/xgettext.c:3344
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "atención: no está presente el contexto para el argumento plural de la palabra clave '%.*s'"
-
-#: src/xgettext.c:3365
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "discordancia de contexto entre las formas de singular y plural"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "entrada estándar"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4236,57 +4712,56 @@ msgstr ""
 "allí la variable MSGID_BUGS_ADDRESS; en caso contrario,\n"
 "debe especificar la opción de línea de órdenes --msgid-bugs-address\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "idioma '%s' desconocido"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: atención: sustitución aislada U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Especifique la codificación del código fuente utilizando --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, 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:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, 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:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4295,148 +4770,208 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: atención: literal RegExp finalizada demasiado pronto"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: atención: %s no está permitido"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: atención: marca XML no finalizada"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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"
+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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, 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:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Especifique la codificación del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación del código fuente utilizando --from-code o "
+"mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
-"Especifique la codificación correcta del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
-"Especifique la codificación del código fuente utilizando --from-code o mediante un comentario\n"
+"Especifique la codificación del código fuente utilizando --from-code o "
+"mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codificación desconocida \"%s\". Se procederá con ASCII en su lugar."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:116
 #, 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:180
 #, 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:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresión de cadena inválida"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: definición de cadena inválida"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: definición de cadena inválida"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: cuidado: la sintaxis $\"...\" se desaconseja por razones de seguridad; mejor utilice eval_gettext"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: cuidado: la sintaxis $\"...\" se desaconseja por razones de "
+"seguridad; mejor utilice eval_gettext"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: atención: literal de expresión regular finalizada demasiado pronto"
+msgstr ""
+"%s:%d: atención: literal de expresión regular finalizada demasiado pronto"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
@@ -4564,6 +5099,109 @@ msgstr "dentro de un comentario o de una instrucción de procesamiento"
 msgid "document ended unexpectedly: %s"
 msgstr "documento finalizado de forma inesperada: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción '--%s' no admite ningún argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opción no reconocida '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: la opción '-W %s' es ambigua\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: la opción '%s' requiere un argumento\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "atención: el encabezado del fichero PO está difuso\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Carácter no ASCII en %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Comentario no ASCII en o precediendo %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Cadena no ASCII en %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: atención: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ 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"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "la cadena de formato '%s' con argumentos sin nombre no se puede localizar "
+#~ "adecuadamente:\n"
+#~ "El traductor no puede reordenar los argumentos.\n"
+#~ "Considere la opción de usar una cadena de formato con argumentos con "
+#~ "nombre\n"
+#~ "y una asociación en lugar de una tupla para los argumentos.\n"
+
+#~ 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 ""
+#~ "msgid vacío. Está reservado por el gettext de GNU:\n"
+#~ "gettext(\"\") regresa la línea de encabezado con la\n"
+#~ "metainformación, no una cadena vacía.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr ""
+#~ "la especificación de argumento es ambigua para la palabra clave '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "atención: no está presente el contexto para el argumento plural de la "
+#~ "palabra clave '%.*s'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "discordancia de contexto entre las formas de singular y plural"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
 #~ msgstr "El elemento raíz <%s> no se permite en un fichero CLDR válido"
 
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 5310dbfea..7e714463f 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,7 +5,7 @@ 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: 2019-04-13 11:21+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"
@@ -13,39 +13,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:325
 #, 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:339
 #, 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:435
 #, 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:450
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
@@ -54,146 +54,134 @@ msgstr "ei suuda luua v�ljundfaili \"%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-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:179
 #, fuzzy, c-format
-msgid "cannot open backup file \"%s\" for writing"
+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:183
 #, fuzzy, c-format
-msgid "error reading \"%s\""
+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:187
 #, fuzzy, c-format
-msgid "error writing \"%s\""
+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:191
 #, fuzzy, c-format
-msgid "error after reading \"%s\""
+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
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:443
 #, c-format
-msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:343
+#: gnulib-lib/csharpexec.c:255
 #, c-format
-msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, 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:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%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"
-msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: v�ti `%s' on mitmet�henduslik\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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tundmatu v�ti `%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%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"
-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"
-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:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+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"
-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"
-msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, 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
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -203,102 +191,287 @@ 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:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, 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/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, 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:265
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "ei suuda luua v�ljundfaili \"%s\""
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
+msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: gnulib-lib/w32spawn.h:49
 #, 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:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "T�iendava info saamiseks proovi `%s --help'.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr ""
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+#, fuzzy
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, 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/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+msgid "cannot extract rules for %s"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "viga faili \"%s\" avamisel (lugemiseks)"
+
 #: 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-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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
@@ -306,107 +479,123 @@ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:181
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+
+#: src/format-c.c:36
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:588
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, 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
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:130 src/format-java.c:191
+#: src/format-csharp.c:127 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:161 src/format-java.c:346
+#: src/format-csharp.c:158 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 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-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -498,90 +687,115 @@ 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
-#: src/format-scheme.c:2375
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "viga \"%s\" lugemisel"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, 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] ""
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, 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
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-perl.c:433
@@ -591,54 +805,72 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
-#, 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-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
 
-#: src/format-python.c:112
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
+#: 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
@@ -675,71 +907,40 @@ 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
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#: src/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
-#, 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:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, 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
-#, 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:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -747,344 +948,401 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 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:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, 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
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
 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
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "v�hemalt kaks faili peab olema ette antud"
+
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+msgid "cannot create XPath context"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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
-#, fuzzy
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:1086
 #, c-format
-msgid "could not get host name"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr ""
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+msgid "cannot read %s: %s"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
 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/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, 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:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, 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:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:426
 #, 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:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, 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:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, 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:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, 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:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, 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:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:452
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:454
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:484
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:488
 #, 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:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, 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:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, 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:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, 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:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, 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:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, 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:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, 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:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, 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:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, 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:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, 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:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1105,31 +1363,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:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, 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:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:1023
 #, 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"
@@ -1138,9 +1396,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "  -V, --version               v�ljastab versiooniinfo ja l�petab programmi t��\n"
 "  -w, --width=NUMBER          m��rab v�ljastatava lehek�lje laiuse\n"
@@ -1157,105 +1415,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:1039
 #, 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:1041
 #, 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:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, 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:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, 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:337 src/msguniq.c:378
 #, 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:380
 #, 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:345 src/msgmerge.c:628
 #, 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:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "sisendfailid on m��ramata"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, 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:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:217
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1281,81 +1531,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:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:246
 #, 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:1576
 #, 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:1579
 #, 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:1608
 #, 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:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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"
@@ -1363,7 +1618,7 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1382,74 +1637,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:1186
 #, c-format
 msgid ""
-"      --omit-header           don't write header with `msgid \"\"' entry\n"
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:339
 #, 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:363 src/msgen.c:359 src/msgmerge.c:642
 #, 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:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, 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:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
 msgid ""
-"      --add-location          preserve '#: filename:line' lines (default)\n"
+"  -n, --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:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, 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:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgen.c:233
+#: src/msgen.c:263
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgen.c:274
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1458,22 +1713,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:201
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumendid on puudu"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1483,67 +1738,85 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:276
 #, 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
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "standardsisend"
+
+#: src/msgexec.c:283
 #, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
-msgid "write to stdout failed"
+msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:355
 #, c-format
-msgid "write to %s subprocess failed"
+msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:304
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumendid on puudu"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:324
 #, 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:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:441
 #, 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:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1551,210 +1824,237 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:459
 #, 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:477 src/msggrep.c:600
 #, 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:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:485
 #, 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:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
 
-#: src/msgfilter.c:616
+#: src/msgfmt.c:372
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfilter.c:644
+#: src/msgfmt.c:419
 #, c-format
-msgid "communication with %s subprocess failed"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfilter.c:711
+#: src/msgfmt.c:471
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
+msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:302
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, 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
-msgid "Ulrich Drepper"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s ja %s on vastastikku v�listavad"
+
+#: src/msgfmt.c:626 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:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "ei suuda luua v�ljundfaili \"%s\""
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, 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:881
 #, 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:886
 #, 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:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
-#, 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:922
 #, 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:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:931
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:937
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:957
 #, 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:959 src/msgfmt.c:975 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:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1763,48 +2063,93 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:973
 #, 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:979 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:981
 #, 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:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:991
 #, 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:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1812,33 +2157,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1043
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1045
 #, 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:1048
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1846,115 +2191,126 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:1058
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
+
+#: src/msgfmt.c:1063
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1072
 #, 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:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1185
 #, 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:1187
 #, 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
-#, 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
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1211
 #, 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:1216
 #, 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
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:987
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "ignoreerin t�hja `msgstr' kirjet"
 
-#: src/msgfmt.c:988
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1339
 #, 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/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:501
 #, 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:521
 #, 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:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1994,30 +2350,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:602
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2025,24 +2383,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:371
 #, 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:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:383
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2050,54 +2408,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:391
 #, 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:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:406
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:472
 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:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:493
 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:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1117
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2109,54 +2467,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:1621
 #, 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:178 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:258
 #, 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"
+"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 "
+"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:392 src/msgl-iconv.c:366
 #, 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:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:444
 #, 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:450
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2165,7 +2523,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2174,7 +2532,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2183,12 +2541,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2196,7 +2554,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2205,7 +2563,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2213,157 +2571,178 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:145
 #, 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:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:270
 #, 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:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:446
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:478
 #, 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:494
 #, 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:518
 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
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+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
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+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
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+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
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+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:692
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:818
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "p�ise kirjest on puudu v�li `%s'"
+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-check.c:703
+#: src/msgl-check.c:835
 #, 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"
+msgid "header field '%s' missing in header\n"
+msgstr "p�ise kirjest on puudu v�li `%s'"
 
-#: src/msgl-check.c:717
-#, 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:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:730
-#, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "v�li `%s' sisaldab ikka veel algset v��rtust"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
 
-#: src/msgl-iconv.c:64
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: 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:288
 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:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2372,15 +2751,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:330
 #, 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:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2389,16 +2768,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:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:545
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2425,51 +2804,51 @@ msgstr ""
 "kahtlased. Kui v�ljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
 "standardv�ljunisse.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:568
 #, 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:574
 #, 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:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2481,104 +2860,107 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the "
+"The backup suffix is '~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:610
 #, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
 msgstr ""
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1685
 #, 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:1706
 #, 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:2110
 #, 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:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, 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 "
@@ -2586,41 +2968,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:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2633,19 +3015,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:366
 #, 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>"
@@ -2659,7 +3041,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
 "Teadete t�lkimine kasutaja kooditabeli j�rgi v�ib mitte toimida.\n"
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2668,7 +3050,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2677,15 +3059,15 @@ msgstr ""
 "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
 "GNU gettext\n"
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr "J�tkan siiski, vaatamate parsimisvigadele."
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr "J�tkan siiski."
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2694,7 +3076,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2702,124 +3084,160 @@ msgstr ""
 "Kooditabel on p�ises kirjeldamata.\n"
 "T�lgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "vastuoluline #~ kasutamine"
 
-#: src/po-gram-gen.y:240
-#, c-format
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "puudub `msgstr[]' sektsioon"
 
-#: src/po-gram-gen.y:249
-#, c-format
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "puudub `msgid_plural' sektsioon"
 
-#: src/po-gram-gen.y:257
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "puudub `msgstr' sektsioon"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "esimene mitmuse vormi indeks erineb nullist"
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 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:505 src/write-po.c:812 src/write-po.c:949
 #, 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:474
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "tundmatu v�tmes�na: \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "vigane juhtjada"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:979
 #, 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:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, 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:370
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:372
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+msgid "missing '=' after \"%s\""
+msgstr "argumendid on puudu"
+
+#: src/read-desktop.c:468
+#, fuzzy
+msgid "invalid non-blank line"
+msgstr "vigane juhtjada"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "faili \"%s\" sai k�rbitud"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fail \"%s\" ei ole GNU .mo vormingus"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
 
+#: src/read-properties.c:429
+#, fuzzy, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: l�petamata s�mbolkonstant"
+
 #: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
@@ -2835,7 +3253,7 @@ msgstr "%s:%d: hoiatus: l�petamata string"
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: hoiatus: l�petamata string"
@@ -2845,7 +3263,7 @@ msgstr "%s:%d: hoiatus: l�petamata string"
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
@@ -2854,136 +3272,170 @@ msgstr "Selle programmi on kirjutanud %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:363
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/urlget.c:146
+#: src/urlget.c:158
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "liiga palju argumente"
 
-#: src/urlget.c:163
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:180
 #, 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:227
+#, fuzzy, c-format
+msgid "error reading \"%s\""
+msgstr "viga \"%s\" lugemisel"
+
+#: src/urlget.c:233
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-catalog.c:126
+#: src/urlget.c:237
+#, fuzzy, c-format
+msgid "error after reading \"%s\""
+msgstr "viga \"%s\" lugemisel"
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
+#: src/write-catalog.c:125
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:129
+#: src/write-catalog.c:128
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:162
+#: src/write-catalog.c:161
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
+#: src/write-catalog.c:196
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
+#: src/write-catalog.c:201
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, 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:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standardv�ljund"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "vigane multibait jada"
 
-#: src/write-po.c:766
-#, c-format
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
 msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
+"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:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2992,7 +3444,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3001,318 +3453,234 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:133
 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:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "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:340 src/x-javascript.c:748 src/x-python.c:866
 #, 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:591
 #, 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:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, fuzzy, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: l�petamata s�mbolkonstant"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, 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:1654 src/x-vala.c:907
 #, 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:225
+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-javascript.c:321 src/x-python.c:375
 #, 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
-#, 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:1451 src/x-java.c:668
 #, 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:1953 src/x-java.c:1153
 #, 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:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:645
-#, fuzzy, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
-"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-
-#: src/x-java.c:492
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/x-perl.c:307
-#, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-
-#: src/x-perl.c:1038
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
-
-#: src/x-perl.c:1158
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1178
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/xgettext.c:637
 #, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: vigane v�ti -- %c\n"
-
-#: src/x-perl.c:1225
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1242
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "tundmatu keel `%s'"
 
-#: src/x-python.c:233
+#: src/xgettext.c:646
 #, c-format
-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"
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/xgettext.c:701
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-
-#: src/x-python.c:298
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+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/x-python.c:311
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext ei t��ta ilma vajalike v�tmes�nadeta"
 
-#: src/x-python.c:321
+#: src/xgettext.c:839
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/x-python.c:674
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-
-#: src/x-rst.c:109
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr ""
-
-#: src/x-rst.c:173
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr ""
-
-#: src/x-rst.c:208
+#: src/xgettext.c:938
 #, fuzzy, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/x-sh.c:1075
-#, c-format
-msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
-msgstr ""
-
-#: src/xgettext.c:567
-#, 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
-#, 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
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:1050
 #, 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:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:1059
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:1061
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3321,77 +3689,101 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:1070
 #, 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:1075
 #, 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:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:1087
 #, 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:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3399,180 +3791,501 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
 #, 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:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:1146
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:1190
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:1198
 #, 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:1201
 #, 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:1597
 #, 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:1695
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+#: src/xgettext.c:2088
 #, fuzzy, c-format
-msgid "%s%s: warning: "
-msgstr "%s: hoiatus: "
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "tundmatu keel `%s'"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:1968
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/x-javascript.c:344
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: l�petamata s�mbolkonstant"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr ""
+
+#: src/x-perl.c:1074
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/x-perl.c:1195
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/x-perl.c:1215
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/x-perl.c:1249
+#, fuzzy, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s: vigane v�ti -- %c\n"
+
+#: src/x-perl.c:1262
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/x-perl.c:1279
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/x-python.c:279
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/x-python.c:325
 #, c-format
-msgid "language `%s' unknown"
-msgstr "tundmatu keel `%s'"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:342
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:355
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:365
+#, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:398
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr ""
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr ""
+
+#: src/x-rst.c:215
+#, fuzzy, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: hoiatus: l�petamata string"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "vigane juhtjada"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr ""
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "vigane juhtjada"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "vigane multibait jada"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr ""
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+msgid "inside an attribute name"
+msgstr "argumendid on puudu"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: v�tmel `--%s' ei tohi olla argumente\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: tundmatu v�ti `--%s'\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: lubamatu v�ti -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: v�ti `-W %s' on mitmet�henduslik\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: v�tmel `-W %s' ei tohi olla argumente\n"
+
+#, 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"
+
+#, 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"
+
+#, fuzzy, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "v�li `%s' sisaldab ikka veel algset v��rtust"
+
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
+#~ "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
+
+#, fuzzy, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s: hoiatus: "
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -3648,10 +4361,6 @@ msgstr ""
 #~ "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n"
 #~ "Standardne otsinukataloog: %s\n"
 
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
-
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "h�pe \"%s\" positsioonile %ld eba�nnestus"
 
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index 48daf7642..3c040736b 100644
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -15,655 +15,984 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%s argumentu baliogabea %s-rentzat"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%s argumentu anbiguoa %s-rentzat"
 
-#: gnulib-lib/argmatch.c:155
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Argumentu erabilgarria:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:325
 #, 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:336
+#: gnulib-lib/clean-temp.c:339
 #, 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:432
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ezin da aldiroko %s fitxategia ezabatu"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ezin da aldiroko %s direktorioa ezabatu"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: gnulib-lib/copy-file.c:67
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "errorea \"%s\" irakurri ondoren"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() -ek huts egin du"
 
-#: gnulib-lib/csharpcomp.c:539
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Ez da C# konpiladorerik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/csharpexec.c:344
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Sistema errore ezezaguna"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s azpirpozesuak huts egin du"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' aukerak ez du argumenturik onartzen\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: `%c%s' aukera ezezaguna\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' aukera ezezaguna\n"
-
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' aukera ezezaguna\n"
-
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: legezkanpoko aukera -- %c\n"
-
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: aukera baliogabea -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: -- %c aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' aukera anbiguoa da\n"
-
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
-
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errorea \"%s\" fitxategia idazterakoan"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "ez da java konpiladorerik aurkitu, saiatu gcj instalatuaz edo $JAVAC ezarriaz"
+msgstr ""
+"ez da java konpiladorerik aurkitu, saiatu gcj instalatuaz edo $JAVAC ezarriaz"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "ez da java makina birtualik aurkitu, saiatu gcj instalatuaz edo $JAVAC ezarriaz"
+msgstr ""
+"ez da java makina birtualik aurkitu, saiatu gcj instalatuaz edo $JAVAC "
+"ezarriaz"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
-msgid "cannot create pipe"
-msgstr "ezin da tutua sortu"
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "huts %s azpiprozesuan idaztean"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "Huts %s azpiprozesua irakurtzerakoan"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "ezin da tutua sortu"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ezin da \"%s\" irteera fitxategia sortu"
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s azpiprozesua"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s azpiprozesua %d seinale konponezina jaso du"
 
-#: src/format.c:149
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
-msgstr "'%s' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "`%s --help' erabili argibide gehiagorako.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
+"Antzekoa aukerako argumentuentzat.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgid "Written by %s.\n"
+msgstr "%s-ek idatzia.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
 msgstr ""
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "ezin da aldiroko %s direktorioa ezabatu"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgstr "a formateatu - u in s t in"
+
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "'msgid' eta '%s' formatu ezarpenak ez dira berdina %u argumentuarentzat"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 ""
+"'msgid' eta '%s' formatu ezarpenak ez dira berdina %u argumentuarentzat"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u direktiba | -rekin hasten da baina ez | -rekin amaitzen."
 
-#: src/format-c.c:177
+#: src/format.c:152
+#, 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' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
+
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "%u zenbakiko direktiban, '<' ondorengo elementua ez formatu espezifikatzaile makro izena. Baliozko makro izenak  ISO C 99 7.8.1. atalean daude zerrendaturik."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"%u zenbakiko direktiban, '<' ondorengo elementua ez formatu espezifikatzaile "
+"makro izena. Baliozko makro izenak  ISO C 99 7.8.1. atalean daude "
+"zerrendaturik."
 
-#: src/format-c.c:565
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "%u zenbakiko direktiban, '<' ondorengo elementua ez dago '>'-rekin jarraitua."
+msgstr ""
+"%u zenbakiko direktiban, '<' ondorengo elementua ez dago '>'-rekin jarraitua."
 
-#: src/format-c.c:779
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten du."
+msgstr ""
+"Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten "
+"du."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, 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' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
+msgstr ""
+"%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
 
 #: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "%u zenbakidun direktiban, ',' ez dago zenbaki batez jarraitua."
 
-#: src/format-csharp.c:125 src/format-java.c:190
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Katea direktiba erdian amaitzen da: '{' aurkitu da pareko '}' gabe."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "%u zenbakidun direktiba '%c' karaktere baliogabeaz amaitzen da '}'-ren ordez."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"%u zenbakidun direktiba '%c' karaktere baliogabeaz amaitzen da '}'-ren ordez."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "%u zenbakidun direktiba karaktere baliogabe batez amaitzen da '}'-ren ordez."
+msgstr ""
+"%u zenbakidun direktiba karaktere baliogabe batez amaitzen da '}'-ren ordez."
 
-#: src/format-csharp.c:152 src/format-java.c:333
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "KAtea direktiba erdian hasten da: '}' topatu da pareko '{'-rik gabe."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: 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:276 src/format-gcc-internal.c:370
+#: 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:314
+#: 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 zenbakidun direktiban, zehaztapenaren argumentu zenbakia %u-ren berdina izan behar da."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"%u zenbakidun direktiban, zehaztapenaren argumentu zenbakia %u-ren berdina "
+"izan behar da."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:398
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+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: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:424
+#: 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:630
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+#| msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
 
-#: src/format-gcc-internal.c:633
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+#| msgid "'msgid' does not use %%m but '%s' uses %%m"
+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-gfc-internal.c:383
+#, fuzzy, c-format
+#| msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
+
+#: src/format-gfc-internal.c:386
+#, fuzzy, c-format
+#| msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%C but '%s' uses %%C"
 msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Katea direktibaren erdian amaitzen da."
 
-#: src/format-invalid.h:26
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "%u zenbakidun direktiban, 0 zenbakidun argumentua ez da zenbaki oso positibo bat."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"%u zenbakidun direktiban, 0 zenbakidun argumentua ez da zenbaki oso positibo "
+"bat."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "%u zenbakidun direktiban, 0 zenbakidun argumentu zabalera ez da zenbaki oso positibo bat."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"%u zenbakidun direktiban, 0 zenbakidun argumentu zabalera ez da zenbaki oso "
+"positibo bat."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "%u zenbakidun direktiban, zehaztasunaren 0 zenbakidun argumentu  ez da zenbaki oso positibo bat."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"%u zenbakidun direktiban, zehaztasunaren 0 zenbakidun argumentu  ez da "
+"zenbaki oso positibo bat."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "%u zenbakidun direktiban, '%c' karakterea ez da baliozko bihurketa espezifikatzailea."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"%u zenbakidun direktiban, '%c' karakterea ez da baliozko bihurketa "
+"espezifikatzailea."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "%u zenbakidun direktiban amaitzen duren karakterea ez da baliozko bihurketa espezifikatzailea."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"%u zenbakidun direktiban amaitzen duren karakterea ez da baliozko bihurketa "
+"espezifikatzailea."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Kateak %u zenbakidun argumetua erreferentzaitzen du modu ez bateragari batetan."
+msgstr ""
+"Kateak %u zenbakidun argumetua erreferentzaitzen du modu ez bateragari "
+"batetan."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "%u zenbakidun direktiban, \"%s\" azpikatea ez da baiozko data/ordu estilokoa."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"%u zenbakidun direktiban, \"%s\" azpikatea ez da baiozko data/ordu estilokoa."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "%u zenbakidun direktiban, \"%s\" ez dago gako batez jarraitua."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "%u zenbakidun direktiban , \"%s\" azpi-katea ez da baliozko estilo zenbaki bat."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"%u zenbakidun direktiban , \"%s\" azpi-katea ez da baliozko estilo zenbaki "
+"bat."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "%u zenbakidun direktiban, argumentu zenbakia ez dago gako batez eta \"%s\", \"%s\", \"%s\"edo \"%s\" batez jarraitua."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"%u zenbakidun direktiban, argumentu zenbakia ez dago gako batez eta \"%s\", "
+"\"%s\", \"%s\"edo \"%s\" batez jarraitua."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "%u zenbakidun direktiban, hautapen batek ez du zenbakirik."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "%u zenbakidun direktiban, hautapen batek  '<', '#' edo '%s'-ek jarraitzen ez duen zenbaki bat du."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"%u zenbakidun direktiban, hautapen batek  '<', '#' edo '%s'-ek jarraitzen ez "
+"duen zenbaki bat du."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+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:739
+#: 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:759
+#: src/format-java.c:776
 #, 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 "formateatu in eta s - u"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten "
+"du."
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid "a format specification for argument %u doesn't exist in '%s'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "%u argumentuaren formatu espezifikazioa ez dago  '%s'-en"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "errorea \"%s\" irakurtzean"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, fuzzy, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
 msgstr "Handiagotu u u da - mota s a - mota s da."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, fuzzy, c-format
-msgid "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."
+msgid ""
+"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."
 msgstr[0] "Handiagotu u u."
 msgstr[1] "Handiagotu u u."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "Handiagotu u k da Bielorrusiarra a."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, fuzzy, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Handiagotu u l da."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2808
 #, fuzzy
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "katea in - a."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, fuzzy, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "k k."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, fuzzy, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Handiagotu u eta."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, fuzzy, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr "Handiagotu u da Bielorrusiarra bikoa Bielorrusiarra."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, fuzzy, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "Handiagotu u da in baliogabea."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 #, fuzzy
 msgid "The string refers to some argument in incompatible ways."
 msgstr "katea nori in."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, 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:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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:426
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgstr "a formateatu - s t in s"
+
+#: src/format-perl.c:433
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
 msgstr "Handiagotu u tamaina da honekin k."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-python-brace.c:138
 #, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "a formateatu - s t in s"
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "Handiagotu u k da Bielorrusiarra a."
+
+#: src/format-python-brace.c:157
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
+
+#: src/format-python-brace.c:171
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "Handiagotu u k da Bielorrusiarra a."
+
+#: src/format-python-brace.c:193
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
 
-#: src/format-python.c:113
+#: src/format-python-brace.c:278
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Handiagotu u l da."
+
+#: src/format-python.c:115
 #, fuzzy
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
 msgstr "katea nori eta izengabe."
 
-#: src/format-python.c:327
+#: 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:403
+#: src/format-python.c:430
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:410
+#: src/format-python.c:437
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: 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'"
+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:463
+#: src/format-python.c:494
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
-#: src/format-qt.c:78
-#, fuzzy, c-format
-msgid "Multiple references to %%%c."
-msgstr "Anizkoitza nori k."
+#: src/format-qt.c:152
+#, c-format
+msgid ""
+"'%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:80
+#: src/format-sh.c:79
 #, fuzzy
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "katea nori a honekin a ASCII."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 #, fuzzy
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
 msgstr "katea nori a honekin da nori."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 #, fuzzy
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr "katea nori a balioa maiatzak."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 #, fuzzy
 msgid "The string refers to a shell variable with an empty name."
 msgstr "katea nori a honekin hutsik."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, fuzzy, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "Handiagotu u k da a eta."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, fuzzy, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "u da a eta."
-
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
-#, c-format, no-wrap
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Hau software librea da; iturburua ikusi kopiatze baldintzetarako.  EZ dago inolako bermerik;\n"
-"ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.\n"
-
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
-#, c-format
-msgid "Written by %s.\n"
-msgstr "%s-ek idatzia.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr "u da a eta."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "`%s --help' erabili argibide gehiagorako.\n"
-
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Erabilera: %s [AUKERA]\n"
@@ -686,10 +1015,12 @@ msgstr "  -s, --short                 ostalari izen laburra\n"
 #: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          ostalari izen luzea, fuztiz kualifikaturiko domeinu\n"
+"  -f, --fqdn, --long          ostalari izen luzea, fuztiz kualifikaturiko "
+"domeinu\n"
 "                                izena eta ezizena berne\n"
 
 #: src/hostname.c:226
@@ -697,69 +1028,103 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "ezind a ostalari izena eskuratu"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "ezin da tutua sortu"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "ezind a ostalari izena eskuratu"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "%s argumentu baliogabea %s-rentzat"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "ezin da tutua sortu"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "ezin da \"%s\" irteera fitxategia sortu"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -768,280 +1133,366 @@ msgstr ""
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
+"laburrentzat ere.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak bilatzeko zerrendara\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak "
+"bilatzeko zerrendara\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
+"irakurriko da.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Emaitzak irteera estandarrean idatziko dira irteera fitxategirik ezartzen ez bada\n"
+"Emaitzak irteera estandarrean idatziko dira irteera fitxategirik ezartzen ez "
+"bada\n"
 "edo berau - bada.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            mantendu itzulitakoak, ezabatu itzuli gabeko mezuak\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            mantendu itzulitakoak, ezabatu itzuli gabeko "
+"mezuak\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          mantendu itzuli gabekoak, ezabatu itzulitako mezuak\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          mantendu itzuli gabekoak, ezabatu itzulitako "
+"mezuak\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
+msgstr ""
+"      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            mantendu zalantza bezala markaturiko kateka\n"
+msgstr ""
+"      --only-fuzzy            mantendu zalantza bezala markaturiko kateka\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantendu zaharkituriko #~ mezuak\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Atributu manipulazioa:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ezarri kate guztiak zalantza bezala\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           zalantza bandera kendu kate guztiei\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ezarri mezu guztiak zaharkituak bezala\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        ezarri mezu guztiak ez-zaharkituk bezala\n"
+msgstr ""
+"      --clear-obsolete        ezarri mezu guztiak ez-zaharkituk bezala\n"
+
+#: src/msgattrib.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "      --previous              keep previous msgids of translated "
+#| "messages\n"
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+#| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
+
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=FITX.po     FITX.po fitxategian zerrendaturiko sarrerak bakarrik eraldatu\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FITX.po     FITX.po fitxategian zerrendaturiko sarrerak "
+"bakarrik eraldatu\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=FILE.po   FITX.po fitxategian ez zerrendaturiko sarrerak bakarrik eraldatu\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FILE.po   FITX.po fitxategian ez zerrendaturiko sarrerak "
+"bakarrik eraldatu\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy -ren sinonimo\n"
+msgstr ""
+"      --fuzzy                 --only-fuzzy --clear-fuzzy -ren sinonimo\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              --only-obsolete --clear-obsolete -ren sinonimo\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              --only-obsolete --clear-obsolete -ren "
+"sinonimo\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      sarrera fitxategia Java .properties sintaxian dago\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      sarrera fitxategia Java .properties sintaxian "
+"dago\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings sintaxian dago\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings "
+"sintaxian dago\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+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:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                C ihesak erabili irteeran, ez hedatutako karaktereak\n"
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
+#, 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:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
+#, c-format
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                C ihesak erabili irteeran, ez hedatutako "
+"karaktereak\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                .po fitxategia koskadun estiloa erabiliaz idatzi\n"
+msgstr ""
+"  -i, --indent                .po fitxategia koskadun estiloa erabiliaz "
+"idatzi\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:296 src/msgcomm.c:315
+#: 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:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1050,56 +1501,61 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
+"eskuratu\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: 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:381
+#: 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:384 src/msgcomm.c:393
+#: 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:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      sarrera fixtategiak Java .properties sintasian daude\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      sarrera fixtategiak Java .properties sintasian "
+"daude\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1108,39 +1564,45 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategiak NeXTstep/GNUstep .strings\n"
 "                              sintaxian daude\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=IZENA         irteeraren kodeketa\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:429 src/msguniq.c:380
 #, 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:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --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:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "zehazki 2 sarrera fitxategi behar dira"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Erabilera: %s [AUKERA] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1151,79 +1613,87 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      itzulpenak\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     iturburura erreferentziak\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operazio aldagaiak:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          ref.pot ezarri def.po-ko domeinu bakoitzean\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          ref.pot ezarri def.po-ko domeinu bakoitzean\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, 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:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             konutan izan zalantzan dauden sarrerak\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      kontutan izan itzuli gabeko mezuak\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "mezu hau itzuli gabe dago"
 
-#: src/msgcmp.c:312
+#: 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:328 src/msgmerge.c:1214
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "mezu hau erabilia baina definitu gabe daago..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...baina definizio hau oso antzekoa da"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:440
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "oharra: mezu hau ez da erabiltzen"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:304
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1231,77 +1701,89 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:390
+#: 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:434 src/xgettext.c:875
-#, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, fuzzy, c-format
+#| msgid ""
+#| "      --keep-header           keep header entry unmodified, don't filter "
+#| "it\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
+"      --keep-header           utzi goiburua eraldatu gabe, ez berau iragazi\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Itzulpen katalogo bat karaktere kodeketa ezberdin batera bihurtzen du.\n"
+msgstr ""
+"Itzulpen katalogo bat karaktere kodeketa ezberdin batera bihurtzen du.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Bihurtze helburua:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kokadun irteera estiloa\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
-#: src/msgmerge.c:546
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           kendu '#: filename:line' lerroak\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
-#: src/msgmerge.c:548
-#, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "      --add-location          mantendu '#: filename:line' lerroak (lehenetsia)\n"
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, fuzzy, c-format
+#| msgid ""
+#| "      --add-location          preserve '#: filename:line' lines "
+#| "(default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          mantendu '#: filename:line' lerroak "
+"(lehenetsia)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
-#: src/msgmerge.c:550
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgen.c:234
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "zehazki sarrera fitxategi bat behar da"
 
-#: src/msgen.c:275
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Erabilera: %s [AUKERA] SAR_FITXATEGIA\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1310,22 +1792,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   sarrera PO edo POT fitxategia\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "komando izena falta da"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] KOMANDOA [KOMANDO-AUKERA]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1335,451 +1817,617 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:276
 #, 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:265 src/msgfilter.c:413
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "sarrera estandarra"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       sarrera PO fitxategia\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "huts irteera estandarrean idaztean"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "huts %s azpiprozesuan idaztean"
-
-#: src/msgfilter.c:301
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "iragazki izena falta da"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] IRAGAZKIA [IRAGAZKI-AUKERA]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:417
 #, 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:428
+#: src/msgfilter.c:441
 #, 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:433
+#: src/msgfilter.c:446
 #, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+msgid "Filter input and output:\n"
 msgstr ""
 
-#: src/msgfilter.c:435
-#, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:437
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
-"                                to be executed\n"
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:452
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
-#, 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:458 src/msggrep.c:584
+#: src/msgfilter.c:454
 #, c-format
-msgid "      --indent                indented output style\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:456
 #, 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"
+msgid ""
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
+"                                to be executed\n"
+msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:459
 #, c-format
-msgid "Not yet implemented."
-msgstr "Oraindik ez da onartzen."
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
+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:645
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
+msgid "      --indent                indented output style\n"
+msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:485
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "Huts %s azpiprozesua irakurtzerakoan"
+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:712
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "s hau duena a katea"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:471
+#, fuzzy, c-format
+#| msgid "If no input file is given or if it is -, standard input is read.\n"
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
+"irakurriko da.\n"
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s eta %s ez dira bateragarriak"
+
+#: src/msgfmt.c:626 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:484 src/msgfmt.c:490
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, 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:601
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "ezin da \"%s\" irteera fitxategia sortu"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "itzulitako kate %d"
 msgstr[1] "%d itzulitako kate"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", zalantzan kate %d"
 msgstr[1] ", %d kate zalantzan"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:886
 #, 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:631
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:910
 #, 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:640 src/xgettext.c:751
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-"Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
-"Antzekoa aukerako argumentuentzat.\n"
-
-#: src/msgfmt.c:647
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java modua: Java ResourceBundle klase bat sortu\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java modua: Java ResourceBundle klase bat "
+"sortu\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 --java bezala ,  bain Java2 erabiliaz (JDK 1.2 edo altuagoa)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 --java bezala ,  bain Java2 erabiliaz (JDK 1.2 "
+"edo altuagoa)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# modua: .NET .dll fitxategi bat sortu\n"
+msgstr ""
+"      --csharp                C# modua: .NET .dll fitxategi bat sortu\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl modua: tcl/msgcat .msg fitxategi bat sortu\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl modua: tcl/msgcat .msg fitxategi bat "
+"sortu\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:941
 #, 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:673
+#: src/msgfmt.c:943
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
+
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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:678
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Irteera fitxategi kokapena java moduan:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LAKALA         lokal izena, edo hizkunzta edo hizkutza_NAZIOA\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LAKALA         lokal izena, edo hizkunzta edo "
+"hizkutza_NAZIOA\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:963
+#, fuzzy, c-format
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
+"bat da\n"
+
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIRECTORY                klse direktorio ierarkiaren oinarri direktorioa\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d DIRECTORY                klse direktorio ierarkiaren oinarri "
+"direktorioa\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Klase izena errekurtso izenari lokal izena azpiko barra batez bereizirik gehituaz\n"
-"ateratzen da.  -d auekra beharrezkoa da.  Klasea ezarritako direktorioaren azpian\n"
+"Klase izena errekurtso izenari lokal izena azpiko barra batez bereizirik "
+"gehituaz\n"
+"ateratzen da.  -d auekra beharrezkoa da.  Klasea ezarritako direktorioaren "
+"azpian\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Irteera fitxategi kokalekua C# moduan:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:981
 #, 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:704
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Irteera fitxategi kokapena Tcl moduan:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"-l eta -d aukerak beharrezkoak dira.  .msg fitxategia ezarritako direktorioan\n"
+"-l eta -d aukerak beharrezkoak dira.  .msg fitxategia ezarritako "
+"direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+"  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             zalantzazko kateak erabili irteeran\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:1058
+#, c-format
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+
+#: src/msgfmt.c:1060
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               fitxategi bitarrak ez du hash taula barneratuko\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               fitxategi bitarrak ez du hash taula "
+"barneratuko\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
 
-#: src/msgfmt.c:880
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "oharra: PO fitxategi burua nahasirik\n"
-
-#: src/msgfmt.c:882
-#, 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:906
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1216
 #, 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"
+msgstr ""
+"\"%s\" domeinu izena ez da fixtategi izen bezala erabili: aurrizki bat "
+"erabiliko da"
 
-#: src/msgfmt.c:925
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "`domain %s' direktiba alde batetara utziko da"
 
-#: src/msgfmt.c:985
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:986
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 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
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "'%c' aukera ezin da erabili 'J' , 'K' , 'T' , 'C' edo 'X' ezarria izan ondoren"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"'%c' aukera ezin da erabili 'J' , 'K' , 'T' , 'C' edo 'X' ezarria izan "
+"ondoren"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:521
 #, 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:531
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1819,32 +2467,41 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                C ihesak erabili irteeran, ez hedatutako karaktereak\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                C ihesak erabili irteeran, ez hedatutako "
+"karaktereak\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          fitxategi kokapenez ordenatu\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Izkuntza ezarri gabeko ingurune batetan zaude.  Mesedez\n"
 "ezarri LANG ingurune aldagaia, ABOUT-NLS fitxategian azaltzen\n"
 "den moduan.  HAu beharrezkoa da itzulpenak probatu ahal izateko.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1855,12 +2512,12 @@ msgstr ""
 "Mesedez ezarri locale-a --locale aukeraren bidez edo irteera\n"
 ".po fitxategia --output-file fitxategiaren bidez.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s-ek sortua .\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -1869,43 +2526,51 @@ msgstr ""
 "PO fitxategi berri bat sortu, meta informazioa erabiltzailearen inguruneko balioez\n"
 "abiarazten.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SAR_FITXATEGIA       sarrera POT fitxategia\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Sarrera fitxategirik ematen ez bada, uneko fitxategia arakatuko da POT fitxategiaren bila.\n"
+"Sarrera fitxategirik ematen ez bada, uneko fitxategia arakatuko da POT "
+"fitxategiaren bila.\n"
 "berau - bada, sarrera estandarra irakurriko da\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=FITXATEGIA      idatzi irteera ezarritako PO "
+"fitxategian\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:391
 #, 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:391
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          helburu locale-a ezarri\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         PO fitxategia automatikoki sortu dela pentsatu\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         PO fitxategia automatikoki sortu dela "
+"pentsatu\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1913,12 +2578,12 @@ msgstr ""
 ".pot fitxategi bat baino gehiago topatu da.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "errorea uneko direkotrioa irakurtzerakoan"
 
-#: src/msginit.c:470
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1926,59 +2591,69 @@ msgstr ""
 "Ez da uneko direkotrioan .pot fitxategirik aurkitu.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s azpiprozesuak %d irteera kodeaz huts egin du"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Mezu katalogo berriak zure eposta helbidea eduki beharko luke, horrela erabiltzaileek\n"
-"itzulpenari buruzko iruzkinak egin diezazkizuke eta garatzaileak zurekin harremanetan\n"
+"Mezu katalogo berriak zure eposta helbidea eduki beharko luke, horrela "
+"erabiltzaileek\n"
+"itzulpenari buruzko iruzkinak egin diezazkizuke eta garatzaileak zurekin "
+"harremanetan\n"
 "ipini daitezke arazo teknikorik suertatuaz gero.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:178 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:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:205
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:203
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+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:209
+#: 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"
+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:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "s da a."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
@@ -1989,17 +2664,20 @@ msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Sarrera fitxategiek kodeketa ezberdinetako kateak dituzte, UTF-8 besteen artean.\n"
+"Sarrera fitxategiek kodeketa ezberdinetako kateak dituzte, UTF-8 besteen "
+"artean.\n"
 "Irteera UTF-8 -ra bihurtzen.\n"
 
 #: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Sarrera fitxategiek kodeketa ezberdinetako kateak dituzte,  %s eta %s besteen artean.\n"
+"Sarrera fitxategiek kodeketa ezberdinetako kateak dituzte,  %s eta %s "
+"besteen artean.\n"
 "Irteera UTF-8 -ra bihurtzen.\n"
 "BEste irteera kodeketa bat hautatzeko, --to-code aukera erabili.\n"
 
@@ -2012,7 +2690,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2025,12 +2703,12 @@ msgstr ""
 "'%s'-ren irteera okerra izan.\n"
 "Aukera posibleak:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:99
 #, 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:107
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2041,7 +2719,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero %s 'msgconv' erabiliaz atzera bihurtu.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2054,7 +2732,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero 'msgconv' erabiliaz %s-ra atzera bihurtu.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2065,133 +2743,167 @@ msgstr ""
 "'%s'-ren irteera okerra izan daiteke.\n"
 "Aukera bat LC_ALL=C ezartzea da.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "espresio pluralek balio negatiboak sortu ditzakete"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu baina plural espresioek %lu baino balio handiagoak sortu "
+"ditzakete"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "espresio pluralek 0-z zatiketak srotu ditzakete"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "espresio pluralek zenbaki oso gainezkatze bat sortu dezakete"
 
-#: src/msgl-check.c:153
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "espresio pluralek salbuespen aritmetikoak sortu ditzakete, posibleki 0-z zatiketak"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"espresio pluralek salbuespen aritmetikoak sortu ditzakete, posibleki 0-z "
+"zatiketak"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:478
 #, 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:400
+#: src/msgl-check.c:494
 #, 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:420
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: "
+"nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
 
-#: src/msgl-check.c:502
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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:510
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+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:525
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+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:543
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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:551
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+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:566
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+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:578
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
+
+#: src/msgl-check.c:835
+#, fuzzy, c-format
+#| msgid "headerfield `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
 msgstr "`%s' goiburu eremua falta da goiburuan\n"
 
-#: src/msgl-check.c:678
-#, 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:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:692
-msgid "some header fields still have the initial default value\n"
-msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
 #, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2203,37 +2915,48 @@ msgstr "%s: sarrera ez da baliozkoa \"%s\" kodeketan"
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: errorea \"%s\" kodeketatik \"%s\" kodeketara bihurketa egitean"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
+msgstr ""
+"sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan oinarriturik dago, eta iconv() -ek ez du bihurketa hau onartzen."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+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:314
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan oinarriturik dago. Bertsio hau iconv() gabe erabili zen."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+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:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s %s-rekin bakarrik da baliozkoa"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "babeskopia mota"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2247,56 +2970,58 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:568
 #, 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:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                def.po eguneratu,\n"
-"                              ez egin ezer def.po dagoeneko eguneraturik badago\n"
+"                              ez egin ezer def.po dagoeneko eguneraturik "
+"badago\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:588
 #, 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:590
 #, 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:592
 #, 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:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2304,134 +3029,154 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "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:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
+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:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       kendu aurrerapen erakusleak\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "mezu honek plural moduak ezarri behar ditu"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1706
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "uneko"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " eginda.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: 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:416
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n"
 
-#: src/msgunfmt.c:420
+#: 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:429
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java modua: sarrera Java ResourceBundle klase bat da\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java modua: sarrera Java ResourceBundle klase "
+"bat da\n"
 
-#: src/msgunfmt.c:431
+#: 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"
+msgstr ""
+"      --csharp                C# modua: sarrera .NET .dll fitxategi bat da\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi bat da\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
+"bat da\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FITXATEGIA...               sarrera .mo fixtaegiak\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Sarrera fitxategi kokapena Java moduan:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Sarrera fitxategi kokapen C# moduan\n"
 
-#: src/msgunfmt.c:464
+#: 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:468
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Sarrera fitxategi kokalekua Tcl moduan\n"
 
-#: src/msgunfmt.c:474
+#: 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:494
+#: 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:496
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2444,22 +3189,27 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated              errepikaturiko mezuak bakarrik inprimatu\n"
+msgstr ""
+"  -d, --repeated              errepikaturiko mezuak bakarrik inprimatu\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                mezu bakarrak bakarrik inprimatu, bikoiztutakoak alboratu\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                mezu bakarrak bakarrik inprimatu, "
+"bikoiztutakoak alboratu\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: 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>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2474,7 +3224,8 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Ez da \"%s\" karaktere jokoa onartzen. %s iconv() funtzioan oinarriturik dago,\n"
+"Ez da \"%s\" karaktere jokoa onartzen. %s iconv() funtzioan oinarriturik "
+"dago,\n"
 "eta iconv() -ek ez du \"%s\" onartzen.\n"
 
 #: src/po-charset.c:564 src/po-charset.c:612
@@ -2516,18 +3267,21 @@ msgid "inconsistent use of #~"
 msgstr "#~ -ren erabilera okerra"
 
 #: src/po-gram-gen.y:241
-#, c-format
-msgid "missing `msgstr[]' section"
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "`msgstr[]' atala falta da"
 
 #: src/po-gram-gen.y:250
-#, c-format
-msgid "missing `msgid_plural' section"
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "`msgid_plural' atala falta da"
 
 #: src/po-gram-gen.y:258
-#, c-format
-msgid "missing `msgstr' section"
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "`msgstr' atala falta da"
 
 #: src/po-gram-gen.y:397
@@ -2540,113 +3294,149 @@ 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:93 src/po-lex.c:112
+#: 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:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "multibyte sekuentzia baliogabea"
 
-#: src/po-lex.c:468
+#: 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:478
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "byte-anitzeko sekuentzia amaitugabea lerro amaieran"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv hutsa"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "\"%s\" hitz-gakoa ezezaguna da"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "kontrol sekuentzia baliogabea"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "fitxategi-amaiera katerik gabe"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "lerro-amaiera katerik gabe"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "bikoizturiko mezu definizioa"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "hau da lehen definizioaren kokalekua"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "iragazki izena falta da"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "nplurals balio baliogabea"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" fixtategia hondaturik dago"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "s hau duena a katea"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "s hau duena a katea"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" fitxategia ez da GNU .mo formatukoa"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:197
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "s hau duena a katea s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: \\uxxxx sintasi baliogabe Unicode karaktereentzat"
 
-#: src/read-stringtable.c:804
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "oharra: amaitugabeko katea"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "oharra: sintasi errorea"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "oharra: amaitugabeko kate/balio parea"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr "oharra: sintasi errorea, ';' espero zen katearen ondoren"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "oharra: sintasi errorea, '=' edo ';' espero zen katearen ondoren"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s-ek eta %s-ek idatzia.\n"
@@ -2655,16 +3445,16 @@ msgstr "%s-ek eta %s-ek idatzia.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Serbiar testua Zirilikotik Latin skript-era birkodekatu\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -2673,27 +3463,27 @@ msgstr ""
 "Sarrera testua sarrera estandarretik irakurtzen da. Bihurturiko testua\n"
 "irteera estandarrera aterako da\n"
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "errorea \"%s\" kodeketatik  \"%s\" kodeketara formatua bihurtzean"
 
-#: src/urlget.c:147
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "bi argumentu espero ziren"
 
-#: src/urlget.c:164
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Erabilera: %s [AUKERA] URL FITXATEGIA\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2702,92 +3492,139 @@ msgstr ""
 "URL batetako edukiak eskuratu eta atera.  URL-a ezin bada ebatzi,\n"
 "lokalki eskuragarri dagoen FITXATEGIA erabiliko da.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "errorea \"%s\" irakurtzean"
+
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "errorea irteera estandarrean idazterakoan"
 
-#: src/write-catalog.c:102
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "errorea \"%s\" irakurri ondoren"
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
+#: src/write-catalog.c:125
 #, fuzzy
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr "a single honekin formateatu horren ordez."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:128
 #, fuzzy
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr "a single honekin formateatu."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:161
 #, fuzzy
-msgid "message catalog has context dependent translations, but the output format does not support them."
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr "formateatu."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:196
 #, fuzzy
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr "formateatu a Java horren ordez - a."
 
-#: src/write-catalog.c:178
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "mezu katalogoak itzulpen pluralak ditu, baina irteera formatuak ez ditu onartzen."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"mezu katalogoak itzulpen pluralak ditu, baina irteera formatuak ez ditu "
+"onartzen."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "irteera estandarra"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
-"baina C# .dll formatuak ez du testuingururik onartzen\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Huts \"%s\" direktorioa sortzerakoan"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
-"baina Java ResourceBundle formatuak ez du testuingururik onartzen\n"
+#: src/write-csharp.c:773
+#, fuzzy, c-format
+#| msgid "compilation of C# class failed, please try --verbose"
+msgid "compilation of C# class failed"
+msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
+
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
 
-#: src/write-java.c:945
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
+"$JAVAC ezarriz"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
+#: src/write-java.c:1219
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
+"$JAVAC ezarriz"
 
-#: src/write-po.c:567
-#, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "multibyte sekuentzia baliogabea"
+
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2801,7 +3638,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2815,7 +3652,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -2823,15 +3660,16 @@ msgstr ""
 "mezu katalogoak forma plural itzulpenak ditu\n"
 "baina Qt mezu katalogo formatuak ez du plural kudeaketa onartzen\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:694
 #, 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"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:718
 #, fuzzy
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
@@ -2844,309 +3682,256 @@ msgstr "karakterera Qt formateatu Unicode in in n"
 msgid "error while writing to %s subprocess"
 msgstr "errorea %s azpirpozesuan idazterakoan"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 #, 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:151
+#: src/write-resources.c:152
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr "C formateatu t n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr "formateatu t n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "s l katea"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "s l katea"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "s l katea"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1654 src/x-vala.c:907
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
-#, fuzzy, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:225
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr "ASCII katea s s Nork n"
 
-#: src/x-csharp.c:263
+#: 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:279
+#: 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:291
+#: 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:300
+#: 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:309 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
 
-#: src/x-csharp.c:332
+#: 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:1382 src/x-python.c:1259
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
-
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "s l katea"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
-
-#: src/x-glade.c:463
-#, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
-"\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
-"Bertsio hau expta gabe eraiki da.\n"
-
-#: src/x-perl.c:307
-#, 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:1033
-#, 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:1153
-#, 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:1173
-#, 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:1207
-#, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: aldagai interpolazio baliogabe a \"%c\"-en"
 
-#: src/x-perl.c:1220
-#, 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:1237
-#, 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:234
+#: src/xgettext.c:637
 #, fuzzy, c-format
-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:282
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"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:299
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"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:312
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"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:322
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"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:355
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\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 l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
-
-#: src/x-python.c:675
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
-
-#: src/x-rst.c:107
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: kate definizio baliogabea"
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "`%s' hizkuntza ezezaguna"
 
-#: src/x-rst.c:171
+#: src/xgettext.c:646
 #, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: zenbaki bat faltda da # ondoren"
+msgid "sentence end type '%s' unknown"
+msgstr ""
 
-#: src/x-rst.c:206
+#: src/xgettext.c:701
 #, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: kate espresio baliogabea"
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr ""
+"--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/x-sh.c:1074
+#: src/xgettext.c:705
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun arrazoiegatik ; eval_gettext erabili horren ordez"
+msgid "xgettext cannot work without keywords to look for"
+msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:839
 #, 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"
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
 
-#: src/xgettext.c:552
+#: src/xgettext.c:920
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:695
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:746
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po ordez)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
+"ordez)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko dira\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
+"dira\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:780
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=IZENA        ezarritako hizkuntza ezagutu\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko da.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
+"da.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3155,214 +3940,728 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:1078
 #, 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:801
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=FITXATEGIA.po  FITXATEGIA.po fitxategiko kateak ez dira "
+"irauliko\n"
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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:805
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java,C#, awk, Tcl,\n"
-"                                Perl, PHP, GCC-source eta Glade hizkuntzetan bakarrik)\n"
+"                                EmacsLisp, librep, Scheme, Java,C#, awk, "
+"Tcl,\n"
+"                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
+"bakarrik)\n"
 
-#: src/xgettext.c:817
-#, c-format
+#: src/xgettext.c:1113
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
+"                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Java,C#, awk, "
+"Tcl,\n"
+"                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
+"bakarrik)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
-#, c-format
+#: src/xgettext.c:1121
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-"
+#| "source)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java,C#, awk, YCP,\n"
-"                                Tcl, Perl, PHP, GCC-source hizkuntzetan bakarrik)\n"
+"                                EmacsLisp, librep, Scheme, Java,C#, awk, "
+"YCP,\n"
+"                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
+"bakarrik)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1126
 #, 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:833
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
+msgstr ""
+"                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
+"eskuratu\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (C++ hizkuntz bakarrik)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:1138
+#, fuzzy, c-format
+#| msgid "      --qt                    recognize Qt format strings\n"
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt formatuko kateak antzeman\n"
+
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 kate formatu atzemateari buruzko informazio hedatuagoa\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 kate formatu atzemateari buruzko informazio "
+"hedatuagoa\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --strict                write strict uniforum style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          alde batera utzi FSF copyright-a kanpoko erabiltzaileen irteeran\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
+"erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:1192
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte helbidea ezarri\n"
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
 
-#: src/xgettext.c:883
-#, c-format
-msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
-msgstr "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr sarreretan\n"
+#: src/xgettext.c:1194
+#, fuzzy, c-format
+#| msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:1196
 #, c-format
-msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
-msgstr "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr sarreretan\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
+"helbidea ezarri\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1198
+#, fuzzy, c-format
+#| msgid ""
+#| "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:1201
+#, fuzzy, c-format
+#| msgid ""
+#| "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:1597
 #, c-format
-msgid "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"
+msgid ""
+"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:1750
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: oharra: "
+#: src/xgettext.c:1872
+#, fuzzy
+#| msgid ""
+#| "The option --msgid-bugs-address was not specified.\n"
+#| "If you are using a `Makevars' file, please specify\n"
+#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+#| "specify an --msgid-bugs-address command line option.\n"
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Ez da --msgid-bugs-address aukera ezarri.\n"
+"`Makevars' fitxategi bat erabiltzen ari bazara, mesedez ezarri\n"
+"MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
+"--msgid-bugs-address aukera komando lerroan.\n"
+
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "`%s' hizkuntza ezezaguna"
+
+#: src/x-javascript.c:231
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "ASCII katea s s Nork n"
 
-#: src/xgettext.c:1933
+#: src/x-javascript.c:275
+#, 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-javascript.c:291
+#, 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-javascript.c:303
+#, 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-javascript.c:312
+#, 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-javascript.c:344
+#, 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-javascript.c:919
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "s l katea"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "s l katea"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
+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/xgettext.c:1934
+#: src/x-perl.c:1074
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr ""
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: eskuin giltza falta da hemen:  \\x{HEXNUMBER}"
 
-#: src/xgettext.c:1965
+#: src/x-perl.c:1195
 #, 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:1215
+#, 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:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: aldagai interpolazio baliogabe a \"%c\"-en"
+
+#: src/x-perl.c:1262
+#, 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:1279
+#, 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:279
+#, fuzzy
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://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/xgettext.c:2023
+#: src/x-python.c:325
+#, fuzzy, c-format
 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 ""
-"Msgid hutsa.  GNU gettext-ek erreserbaturikoa:\n"
-"gettext(\"\")-ek meta informazioa duen goiburua\n"
-"itzultzen du, ez date hutsa.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://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:342
+#, fuzzy, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://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:355
+#, fuzzy, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://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:365
+#, fuzzy, c-format
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://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:398
+#, fuzzy, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/xgettext.c:2626
+#: src/x-python.c:654
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
 
-#: src/xgettext.c:2653
+#: src/x-rst.c:116
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: kate definizio baliogabea"
 
-#: src/xgettext.c:2678
+#: src/x-rst.c:180
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: zenbaki bat faltda da # ondoren"
 
-#: src/xgettext.c:2699
+#: src/x-rst.c:215
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: kate espresio baliogabea"
 
-#: src/xgettext.c:2779
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: kate definizio baliogabea"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: kate definizio baliogabea"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
-"Ez da --msgid-bugs-address aukera ezarri.\n"
-"`Makevars' fitxategi bat erabiltzen ari bazara, mesedez ezarri\n"
-"MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
-"--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:2978
+#: src/x-sh.c:1101
 #, c-format
-msgid "language `%s' unknown"
-msgstr "`%s' hizkuntza ezezaguna"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
+"arrazoiegatik ; eval_gettext erabili horren ordez"
 
-#: libgettextpo/gettext-po.c:85
+#: src/x-vala.c:616
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "s l katea"
+
+#: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<izengabea>"
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "kontrol sekuentzia baliogabea"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "ez da baliozko java klase izena: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "ez da baliozko java klase izena: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "kontrol sekuentzia baliogabea"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "multibyte sekuentzia baliogabea"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "%s argumentu baliogabea %s-rentzat"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "iragazki izena falta da"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: `--%s' aukerak ez du argumenturik onartzen\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: `--%s' aukera ezezaguna\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: legezkanpoko aukera -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: `-W %s' aukera anbiguoa da\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
+
+#, c-format
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
+
+#, fuzzy, c-format
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Anizkoitza nori k."
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Hau software librea da; iturburua ikusi kopiatze baldintzetarako.  EZ dago inolako bermerik;\n"
+#~ "ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.\n"
+
+#, c-format
+#~ msgid "Not yet implemented."
+#~ msgstr "Oraindik ez da onartzen."
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "oharra: PO fitxategi burua nahasirik\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
+
+#, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
+#~ "baina C# .dll formatuak ez du testuingururik onartzen\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
+#~ "baina Java ResourceBundle formatuak ez du testuingururik onartzen\n"
+
+#, c-format
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
+#~ "Bertsio hau expta gabe eraiki da.\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: oharra: "
+
+#~ 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 ""
+#~ "Msgid hutsa.  GNU gettext-ek erreserbaturikoa:\n"
+#~ "gettext(\"\")-ek meta informazioa duen goiburua\n"
+#~ "itzultzen du, ez date hutsa.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 573f0f769..1e84dca27 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-09-01 19:17+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -17,31 +17,34 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "virheellinen argumentti %s kontekstille %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argumentti %s kontekstille %s ei ole yksiselitteinen"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "tilapäisen hakemiston löytäminen epäonnistui, yritä asettaa $TMPDIR-muuttuja"
+msgstr ""
+"tilapäisen hakemiston löytäminen epäonnistui, yritä asettaa $TMPDIR-muuttuja"
 
 #: gnulib-lib/clean-temp.c:339
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "tilapäisen hakemiston luominen mallinnetta ”%s” käyttämällä epäonnistui"
+msgstr ""
+"tilapäisen hakemiston luominen mallinnetta ”%s” käyttämällä epäonnistui"
 
 #: gnulib-lib/clean-temp.c:435
 #, c-format
@@ -57,202 +60,185 @@ msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "säilytetään käyttöoikeudet kohteelle %s"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "virhe avattaessa tiedostoa %s lukemista varten"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "varmuuskopiotiedoston %s avaaminen kirjoittamista varten epäonnistui"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "virhe luettaessa tiedostoa %s"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "virhe kirjoitettaessa tiedostoa %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, c-format
 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:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232 src/msginit.c:1397
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() epäonnistui"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin -- ’%c’\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tiedoston ”%s” luominen epäonnistui"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-java.c:1157 src/write-java.c:1198
-#: src/write-mo.c:812 src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta muuttuja $JAVAC"
+msgstr ""
+"Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta muuttuja $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta muuttuja $JAVA"
+msgstr ""
+"Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta muuttuja $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141 src/msginit.c:1405
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s aliprosessisiirräntävirhe"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/format-kde-kuit.c:239 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 src/x-glade.c:549
-#: libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppui"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "säikeiden luominen epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lukeminen aliprosessista %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "ei-lukitsevan siirron asettaminen aliprosessiin %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "viestintä aliprosessin %s kanssa epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s aliprosessi päättyi poistumiskoodilla %d"
@@ -276,13 +262,13 @@ msgstr "%s aliprosessi päättyi poistumiskoodilla %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "”"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "”"
 
@@ -291,133 +277,317 @@ msgstr "”"
 msgid "setting permissions for %s"
 msgstr "asetetaan käyttöoikeuksia kohteelle %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "putken luominen epäonnistui"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle epäonnistui"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "epäonnistunut tiedostotunnisteen %d palautus: dup2 epäonnistui"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s aliprosessi"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217 src/xgettext.c:2036
-#: src/xgettext.c:2049 src/xgettext.c:2059
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:152
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "’%s’ ei ole kelvollinen %s-muotomerkkijono, toisin kuin ’%s’. Syy: %s"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, fuzzy, c-format
+#| msgid "The root element <%s> is not allowed in a valid Glade file"
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "Juurielementti <%s> ei ole sallittu virheettömässä Glade-tiedostossa"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
+"Valinnaiset argumentit vastaavasti.\n"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -V, --version                Output version information\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -V, --version                Näytä versiotiedot\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, 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/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
+"org>.\n"
+"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists."
+"sourceforge.net>.\n"
+
+# Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi <http://gnu.org/licenses/gpl.html>\n"
+"Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
+"Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille %u sellaisena kuin merkkijonossa ’%s’, ei ole olemassa merkkijonossa ’%s’"
+msgid "Written by %s.\n"
+msgstr "Kirjoittanut %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/cldr-plurals.c:313
+#, fuzzy, c-format
+#| msgid "%s exists but cannot read"
+msgid "%s cannot be read"
+msgstr "%s on olemassa, mutta sen lukeminen epäonnistui"
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgstr ""
+"muotomäärittelyä argumentille %u sellaisena kuin merkkijonossa ’%s’, ei ole "
+"olemassa merkkijonossa ’%s’"
+
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "muotomäärittelyä argumentille %u ei ole merkkijonossa ’%s’"
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ argumentille %u"
+msgstr ""
+"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
+"argumentille %u"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiivinumero %u alkaa merkillä | mutta ei pääty merkkeihin |."
 
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr "’%s’ ei ole kelvollinen %s-muotomerkkijono, toisin kuin ’%s’. Syy: %s"
+
 #  Sanalla token on eri merkityksiä eri asiayhteyksissä. Tässä otaksun, että kyse on merkkijonosta, joka ei sisällä tyhjemerkkejä (välilyöntejä)
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Direktiivinumerossa %u merkkijono merkin ’<’ jäljessä ei ole muotomääritemakron nimi. Kelvolliset makronimet luetellaan ISO C 99 luvussa 7.8.1"
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Direktiivinumerossa %u merkkijono merkin ’<’ jäljessä ei ole "
+"muotomääritemakron nimi. Kelvolliset makronimet luetellaan ISO C 99 luvussa "
+"7.8.1"
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Direktiivissä numero %u merkin ’<’ jäljessä olevaa merkkijonoa ei seuraa merkki ’>’."
+msgstr ""
+"Direktiivissä numero %u merkin ’<’ jäljessä olevaa merkkijonoa ei seuraa "
+"merkki ’>’."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Merkkijono viittaa argumenttiin numero %u, mutta ohittaa argumentin numero %u."
+msgstr ""
+"Merkkijono viittaa argumenttiin numero %u, mutta ohittaa argumentin numero "
+"%u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "muotomäärittelyiden määrä merkkijonossa ’%s’ ja merkkijonossa ’%s’ ei täsmää"
+msgstr ""
+"muotomäärittelyiden määrä merkkijonossa ’%s’ ja merkkijonossa ’%s’ ei täsmää"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "Direktiivissä numero %u argumenttinumeroa ei ole merkin ’{’ jäljessä."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Direktiivissä numero %u numeroa ei ole merkin ’,’ jäljessä."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Merkkijono loppuu keskellä direktiiviä: löytyi ’{’ ilman päättävää suljetta ’}’."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Merkkijono loppuu keskellä direktiiviä: löytyi ’{’ ilman päättävää suljetta "
+"’}’."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Direktiivi numero %u päättyy virheelliseen merkkiin ’%c’ eikä sulkeeseen ’}’."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Direktiivi numero %u päättyy virheelliseen merkkiin ’%c’ eikä sulkeeseen ’}’."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Direktiivi numero %u päättyy virheelliseen merkkiin eikä sulkeeseen ’}’."
+msgstr ""
+"Direktiivi numero %u päättyy virheelliseen merkkiin eikä sulkeeseen ’}’."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Merkkijono alkaa keskeltä direktiiviä: löytyi ’}’ ilman alkusuljetta ’{’."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Merkkijono alkaa keskeltä direktiiviä: löytyi ’}’ ilman alkusuljetta ’{’."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "Merkkijono sisältää yksinäisen ’}’-merkin direktiivinumeron %u jäljessä."
+msgstr ""
+"Merkkijono sisältää yksinäisen ’}’-merkin direktiivinumeron %u jäljessä."
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -431,13 +601,20 @@ msgstr "Direktiivissä numero %u tarkkuus ei ole sallittu ennen merkkiä ’%c�
 
 #: 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 "Direktiivissä numero %u argumenttinumeron tarkkuuden on oltava sama kuin %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Direktiivissä numero %u argumenttinumeron tarkkuuden on oltava sama kuin %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Direktiivissä numero %u tarkkuusmäärittely ei ole sallittu ennen merkkiä ’%c’."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Direktiivissä numero %u tarkkuusmäärittely ei ole sallittu ennen merkkiä "
+"’%c’."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -474,95 +651,143 @@ msgid "The string ends in the middle of a directive."
 msgstr "Merkkijono loppuu keskellä direktiiviä."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Merkkijono viittaa argumentteihin sekä absoluuttisien argumenttinumeroiden avulla että numeroimattomien argumenttimäärittelyjen avulla."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Merkkijono viittaa argumentteihin sekä absoluuttisien argumenttinumeroiden "
+"avulla että numeroimattomien argumenttimäärittelyjen avulla."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "Direktiivissä numero %u argumenttinumero 0 ei ole positiivinen kokonaisluku."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"Direktiivissä numero %u argumenttinumero 0 ei ole positiivinen kokonaisluku."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Direktiivissä numero %u leveyden argumenttinumero 0 ei ole positiivinen kokonaisluku."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Direktiivissä numero %u leveyden argumenttinumero 0 ei ole positiivinen "
+"kokonaisluku."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Direktiivissä numero %u tarkkuuden argumenttinumero 0 ei ole positiivinen kokonaisluku."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Direktiivissä numero %u tarkkuuden argumenttinumero 0 ei ole positiivinen "
+"kokonaisluku."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "Direktiivissä numero %u merkki ’%c’ ei ole kelvollinen muunnosmäärite."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Merkki, joka päättää direktiivin numeron %u ei ole kelvollinen muunnosmäärite."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Merkki, joka päättää direktiivin numeron %u ei ole kelvollinen "
+"muunnosmäärite."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Merkkijono viittaa argumenttinumeroon %u yhteensopimattomilla tavoilla."
+msgstr ""
+"Merkkijono viittaa argumenttinumeroon %u yhteensopimattomilla tavoilla."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen päivämäärä- tai aikatyyli."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen päivämäärä- "
+"tai aikatyyli."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Direktiivissä numero %u pilkku ei seuraa merkkijonoa ”%s”."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen numerotyyli."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen numerotyyli."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Direktiivissä numero %u argumenttinumeroa ei seuraa pilkku tai yksi seuraavista: ”%s”, ”%s”, ”%s”, ”%s”."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Direktiivissä numero %u argumenttinumeroa ei seuraa pilkku tai yksi "
+"seuraavista: ”%s”, ”%s”, ”%s”, ”%s”."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Direktiivissä numero %u valinta ei sisällä numeroa."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Direktiivissä numero %u valinta sisältää numeron, jota ei seuraa ’<’, ’#’ eikä ’%s’."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Direktiivissä numero %u valinta sisältää numeron, jota ei seuraa ’<’, ’#’ "
+"eikä ’%s’."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille {%u}, kuten merkkijonossa ’%s’, ei ole merkkijonossa ’%s’"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"muotomäärittelyä argumentille {%u}, kuten merkkijonossa ’%s’, ei ole "
+"merkkijonossa ’%s’"
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "muotomäärittelyä argumentille {%u} ei ole merkkijonossa ’%s’"
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ argumentille {%u}"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
+"argumentille {%u}"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Merkkijono viittaa argumenttiin numero %u, mutta ohittaa argumentit %u ja %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Merkkijono viittaa argumenttiin numero %u, mutta ohittaa argumentit %u ja %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "muotomäärittelyä argumenteille %u ja %u ei ole olemassa merkkijonossa ’%s’, vain yksi argumentti voidaan ohittaa"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"muotomäärittelyä argumenteille %u ja %u ei ole olemassa merkkijonossa ’%s’, "
+"vain yksi argumentti voidaan ohittaa"
 
-#: src/format-kde-kuit.c:251 src/format-kde-kuit.c:261
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
 msgid "error while parsing: %s"
 msgstr "virhe jäsennettäessä: ”%s”"
@@ -570,15 +795,27 @@ msgstr "virhe jäsennettäessä: ”%s”"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Direktiivissä numero %u parametri %u on ’%s’-tyyppinen, mutta odotettiin ’%s’-tyyppistä parametriä."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Direktiivissä numero %u parametri %u on ’%s’-tyyppinen, mutta odotettiin "
+"’%s’-tyyppistä parametriä."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Direktiivissä numero %u annettiin liian monia parametreja; odotettiin korkeintaan %u parametri."
-msgstr[1] "Direktiivissä numero %u annettiin liian monia parametreja; odotettiin korkeintaan %u parametria."
+msgid ""
+"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."
+msgstr[0] ""
+"Direktiivissä numero %u annettiin liian monia parametreja; odotettiin "
+"korkeintaan %u parametri."
+msgstr[1] ""
+"Direktiivissä numero %u annettiin liian monia parametreja; odotettiin "
+"korkeintaan %u parametria."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -608,276 +845,322 @@ msgstr "Direktiivissä numero %u annettiin sekä @- että :-määritteet."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Direktiivissä numero %u merkkien ’~:[’ jäljessä ei ole kaksi lausetta, jotka on eroteltu merkeillä ’~;’."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Direktiivissä numero %u merkkien ’~:[’ jäljessä ei ole kaksi lausetta, jotka "
+"on eroteltu merkeillä ’~;’."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "Direktiivissä numero %u merkkejä ’~;’ käytetään virheellisessä paikassa."
+msgstr ""
+"Direktiivissä numero %u merkkejä ’~;’ käytetään virheellisessä paikassa."
 
 #: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Merkkijono viittaa johonkin argumenttiin yhteensopimattomilla tavoilla."
+msgstr ""
+"Merkkijono viittaa johonkin argumenttiin yhteensopimattomilla tavoilla."
 
 #: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "muotomäärittelyt merkkijonossa ’%s’ ja merkkijonossa ’%s’ eivät ole yhdenmukaiset"
+msgstr ""
+"muotomäärittelyt merkkijonossa ’%s’ ja merkkijonossa ’%s’ eivät ole "
+"yhdenmukaiset"
 
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "muotomäärittelyt merkkijonossa ’%s’ eivät ole merkkijonon ’%s’ muotomäärittelyiden osajoukko"
-
-#: src/format-perl.c:434
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Direktiivissä numero %u kokomäärittelijä on yhteensopimaton muunnosmäärittelijän ’%c’ kanssa."
+msgstr ""
+"muotomäärittelyt merkkijonossa ’%s’ eivät ole merkkijonon ’%s’ "
+"muotomäärittelyiden osajoukko"
 
-#: src/format-perl-brace.c:199 src/format-python.c:472
-#: src/format-python-brace.c:435 src/format-python-brace.c:448
-#: src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "muotomäärittelyä argumentille ’%s’ ei löydy merkkijonosta ’%s’"
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Merkkijono viittaa argumentteihin sekä argumenttinimien että nimettömien argumenttimäärittelyjen avulla."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Direktiivissä numero %u kokomäärittelijä on yhteensopimaton "
+"muunnosmäärittelijän ’%c’ kanssa."
 
-#: src/format-python.c:355
+#: src/format-python-brace.c:138
 #, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Merkkijono viittaa argumenttiin nimeltään ’%s’ yhteensopimattomilla tavoilla."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa kenttänimeä."
 
-#: src/format-python.c:431
+#: src/format-python-brace.c:157
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta, muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getattr-argumenttia."
 
-#: src/format-python.c:438
+#: src/format-python-brace.c:171
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa, muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta"
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+"Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getitem-argumenttia."
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python-brace.c:193
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "muotomäärittelyä argumentille ’%s’, kuten merkkijonossa ’%s’:ssä, ei löydy merkkijonosta ’%s’"
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Direktiivissä numero %u ei sallita enempää sisäkkäisyyttä muotomääritteessä."
 
-#: src/format-python.c:495
+#: src/format-python-brace.c:278
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ argumentille ’%s’"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Direktiivissä numero %u on päättämätön muotodirektiivi."
 
-#: src/format-python-brace.c:138
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Merkkijono viittaa argumentteihin sekä argumenttinimien että nimettömien "
+"argumenttimäärittelyjen avulla."
+
+#: src/format-python.c:354
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa kenttänimeä."
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr ""
+"Merkkijono viittaa argumenttiin nimeltään ’%s’ yhteensopimattomilla tavoilla."
 
-#: src/format-python-brace.c:151
+#: src/format-python.c:430
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getattr-argumenttia."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta, "
+"muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa"
 
-#: src/format-python-brace.c:166
+#: src/format-python.c:437
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getitem-argumenttia."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa, "
+"muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta"
 
-#: src/format-python-brace.c:186
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "Direktiivissä numero %u ei sallita enempää sisäkkäisyyttä muotomääritteessä."
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"muotomäärittelyä argumentille ’%s’, kuten merkkijonossa ’%s’:ssä, ei löydy "
+"merkkijonosta ’%s’"
 
-#: src/format-python-brace.c:271
+#: src/format-python.c:494
 #, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Direktiivissä numero %u on päättämätön muotodirektiivi."
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
+"argumentille ’%s’"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "’%s’ on yksinkertainen muotomerkkijono, mutta ’%s’ ei ole: se sisältää ’L’-lipun tai kaksilukuisen argumenttinumeron"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"’%s’ on yksinkertainen muotomerkkijono, mutta ’%s’ ei ole: se sisältää ’L’-"
+"lipun tai kaksilukuisen argumenttinumeron"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on ei-ASCII-nimi."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on mutkikas aaltosulkusyntaksi. Tämä syntaksi on tukematon turvallisuussyistä."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Merkkijono viittaa komentoikkunamuuttujaan, jolla on mutkikas "
+"aaltosulkusyntaksi. Tämä syntaksi on tukematon turvallisuussyistä."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jonka arvo saattaa olla erilainen komentoikkunafunktioiden sisällä."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Merkkijono viittaa komentoikkunamuuttujaan, jonka arvo saattaa olla "
+"erilainen komentoikkunafunktioiden sisällä."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on tyhjä nimi."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "Direktiivissä numero %u merkki ’%c’ ei ole luku välillä 1...9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Merkki, joka päättää direktivin numero %u ei ole luku välillä 1...9."
-
-# Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/hostname.c:181 src/msgattrib.c:356 src/msgcat.c:295 src/msgcmp.c:173
-#: src/msgcomm.c:286 src/msgconv.c:245 src/msgen.c:242 src/msgexec.c:187
-#: src/msgfilter.c:289 src/msgfmt.c:417 src/msggrep.c:420 src/msginit.c:269
-#: src/msgmerge.c:357 src/msgunfmt.c:263 src/msguniq.c:265
-#: src/recode-sr-latin.c:111 src/urlget.c:144 src/xgettext.c:646
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi <http://gnu.org/licenses/gpl.html>\n"
-"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:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgcmp.c:179
-#: src/msgcomm.c:292 src/msgconv.c:251 src/msgen.c:248 src/msgexec.c:193
-#: src/msgfilter.c:295 src/msgfmt.c:423 src/msggrep.c:426 src/msginit.c:275
-#: src/msgmerge.c:363 src/msgunfmt.c:269 src/msguniq.c:271 src/urlget.c:150
-#: src/xgettext.c:652
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Kirjoittanut %s.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr "Merkki, joka päättää direktivin numero %u ei ole luku välillä 1...9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:210 src/msgattrib.c:418 src/msgcat.c:364 src/msgcmp.c:210
-#: src/msgcomm.c:356 src/msgconv.c:304 src/msgen.c:301 src/msgexec.c:260
-#: src/msgfilter.c:410 src/msgfmt.c:771 src/msggrep.c:513 src/msginit.c:359
-#: src/msgmerge.c:495 src/msgunfmt.c:424 src/msguniq.c:323
-#: src/recode-sr-latin.c:144 src/urlget.c:173 src/xgettext.c:900
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
-
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Näytä laitteen konenimi.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Tulosteen muoto:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 lyhyt tietokonenimi\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          pitkä tietokonenimi, sisältää kokonaan kelpuutetun\n"
+"  -f, --fqdn, --long          pitkä tietokonenimi, sisältää kokonaan "
+"kelpuutetun\n"
 "                                verkkoaluenimen ja aliakset\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            osoitteet tietokoneelle\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:917 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1080
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\n"
 
-#: src/hostname.c:233 src/msgattrib.c:537 src/msgcat.c:472 src/msgcmp.c:261
-#: src/msgcomm.c:458 src/msgconv.c:388 src/msgen.c:384 src/msgexec.c:309
-#: src/msgfilter.c:510 src/msgfmt.c:919 src/msggrep.c:631 src/msginit.c:423
-#: src/msgmerge.c:622 src/msgunfmt.c:530 src/msguniq.c:420
-#: src/recode-sr-latin.c:165 src/urlget.c:189 src/xgettext.c:1082
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "ei saatu tietokonenimeä"
 
-#: src/hostname.c:235 src/msgattrib.c:539 src/msgcat.c:474 src/msgcmp.c:263
-#: src/msgcomm.c:460 src/msgconv.c:390 src/msgen.c:386 src/msgexec.c:311
-#: src/msgfilter.c:512 src/msgfmt.c:921 src/msggrep.c:633 src/msginit.c:425
-#: src/msgmerge.c:624 src/msgunfmt.c:532 src/msguniq.c:422
-#: src/recode-sr-latin.c:168 src/urlget.c:191 src/xgettext.c:1084
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "on annettava vähintään kaksi tiedostoa"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:242 src/msgattrib.c:546 src/msgcat.c:481 src/msgcmp.c:270
-#: src/msgcomm.c:467 src/msgconv.c:397 src/msgen.c:393 src/msgexec.c:318
-#: src/msgfilter.c:519 src/msgfmt.c:932 src/msggrep.c:640 src/msginit.c:432
-#: src/msgmerge.c:635 src/msgunfmt.c:541 src/msguniq.c:429
-#: src/recode-sr-latin.c:175 src/urlget.c:200 src/xgettext.c:1091
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "putken luominen epäonnistui"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
-"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
-"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/its.c:695
 #, c-format
-msgid "could not get host name"
-msgstr "ei saatu tietokonenimeä"
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "virheellinen argumentti %s kontekstille %s"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "putken luominen epäonnistui"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, fuzzy, c-format
+#| msgid "%s does not exist"
+msgid "\"%s\" node does not have \"%s\""
+msgstr "%s ei ole olemassa"
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "tulostetiedoston ”%s” luominen epäonnistui"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:471 src/msgfmt.c:479
-#: src/msgfmt.c:494 src/msgfmt.c:516 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:662 src/xgettext.c:669 src/xgettext.c:672
-#: src/xgettext.c:675
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -886,128 +1169,140 @@ msgstr ""
 "Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
 "ja manipuloi attribuutteja.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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"
+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:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:789 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:918
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Syötetiedostosijainti:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SYÖTETIEDOSTO               syötteen PO-tiedosto\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:793 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:924
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=HAKEMISTO   lisää HAKEMISTO syötetiedostojen hakuluetteloon\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=HAKEMISTO   lisää HAKEMISTO syötetiedostojen "
+"hakuluetteloon\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:815 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:929
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Tulostetiedostosijainti:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:817 src/msgfmt.c:866
-#: src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492 src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn tiedostoon\n"
+msgstr ""
+"  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn tiedostoon\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Tulokset kirjoitetaan vakiotulosteeseen, jos tulostetiedostoa ei ole määritelty\n"
+"Tulokset kirjoitetaan vakiotulosteeseen, jos tulostetiedostoa ei ole "
+"määritelty\n"
 "tai jos se on -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Viestivalinta:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            pidä käännetyt, poista kääntämättömät viestit\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            pidä käännetyt, poista kääntämättömät viestit\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          pidä kääntämättömät, poista käännetyt viestit\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          pidä kääntämättömät, poista käännetyt viestit\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              poista ’fuzzy’-merkityt vajaat viestit\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            pidä ’fuzzy’-merkityt vajaat viestit\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           poista vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         pidä vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribuuttimanipulointi:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             aseta kaikki viestit vajaiksi\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           aseta kaikki viestit epävajaiksi\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          aseta kaikki viestit vanhentuneiksi\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        aseta kaikki sanomat ei-vanhentuneiksi\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1016,187 +1311,236 @@ msgstr ""
 "      --previous              kun asetetaan vajaiksi, säilytä käännettyjen\n"
 "                              viestien aikaisemmat msgid-merkkijonot\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 poistettaessa ’fuzzy’-merkityt vajaat viestit poista myös tyhjä msgstr\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 poistettaessa ’fuzzy’-merkityt vajaat viestit "
+"poista myös tyhjä msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=TIEDOSTO.po manipuloi vain rivejä, jotka on luetteloitu tiedostossa TIEDOSTO.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=TIEDOSTO.po manipuloi vain rivejä, jotka on luetteloitu "
+"tiedostossa TIEDOSTO.po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=TIEDOSTO.po manipuloi vain rivejä, joita ei ole luetteloitu tiedostossa TIEDOSTO.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=TIEDOSTO.po manipuloi vain rivejä, joita ei ole "
+"luetteloitu tiedostossa TIEDOSTO.po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 synonyymi valitsimelle --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                 synonyymi valitsimelle --only-fuzzy --clear-"
+"fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              synonyymi valitsimelle --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              synonyymi valitsimelle --only-obsolete --clear-"
+"obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:879 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syötetiedoston syntaksi:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      syötetiedosto on Java .properties -syntaksissa\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      syötetiedosto on Java .properties -"
+"syntaksissa\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     syötetiedosto on NeXTstep/GNUstep .strings -syntaksissa\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     syötetiedosto on NeXTstep/GNUstep .strings -"
+"syntaksissa\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:907 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1026
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1028
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
-"      --color                 käytä aina värejä ja muita tekstiattribuutteja\n"
-"      --color=MILLOIN         käytä värejä ja muita tekstiattribuutteja, jos MILLOIN.\n"
-"                              MILLOIN saattaa olla ’always’, ’never’, ’auto’, tai ’html’.\n"
+"      --color                 käytä aina värejä ja muita "
+"tekstiattribuutteja\n"
+"      --color=MILLOIN         käytä värejä ja muita tekstiattribuutteja, jos "
+"MILLOIN.\n"
+"                              MILLOIN saattaa olla ’always’, ’never’, "
+"’auto’, tai ’html’.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1032
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=TYYLITIEDOSTO   määritä CSS-tyylisääntötiedosto valitsimelle --color\n"
+msgstr ""
+"      --style=TYYLITIEDOSTO   määritä CSS-tyylisääntötiedosto valitsimelle --"
+"color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1034
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa (oletus)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa "
+"(oletus)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1036
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei laajennettuja merkkejä\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei "
+"laajennettuja merkkejä\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1038
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              kirjoita PO-tiedosto vaikka se on tyhjä\n"
+msgstr ""
+"      --force-po              kirjoita PO-tiedosto vaikka se on tyhjä\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1040
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                kirjoita .po -tiedosto käyttäen sisennettyä tyyliä\n"
+msgstr ""
+"  -i, --indent                kirjoita .po -tiedosto käyttäen sisennettyä "
+"tyyliä\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1042
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           älä kirjoita ’#: filename:line’ -rivejä\n"
+msgstr ""
+"      --no-location           älä kirjoita ’#: filename:line’ -rivejä\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1044
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          tuota ’#: filename:line’ -rivit (oletus)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          tuota ’#: filename:line’ -rivit (oletus)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1046
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                luo tiukasti Uniforum-yhteensopiva .po-tiedosto\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                luo tiukasti Uniforum-yhteensopiva .po-"
+"tiedosto\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     luo Java .properties -tiedosto\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1050
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    luo NeXTstep/GNUstep .strings -tiedosto\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    luo NeXTstep/GNUstep .strings -tiedosto\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1052
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          aseta tulostesivun leveys\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1054
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               älä katkaise pitkiä viestirivejä, pitempiä kuin\n"
+"      --no-wrap               älä katkaise pitkiä viestirivejä, pitempiä "
+"kuin\n"
 "                              tulostesivun leveys, useammalle riville\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1057
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1059
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          lajittele tuloste tiedostosijainnin mukaan\n"
+msgstr ""
+"  -F, --sort-by-file          lajittele tuloste tiedostosijainnin mukaan\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "määritelty mahdoton valintakriteeri (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:904
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]...\n"
 
 #  Pistekommentilla tarkoitan kehittäjän kääntäjää varten lisäämiä kommentteja, jotka alkavat risuaitamerkillä ja sen jälkeisellä pisteellä.
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1219,58 +1563,66 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:920
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:922
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
+msgstr ""
+"  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:795
-#: src/xgettext.c:926
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jos syötetiedosto on -, luetaan vakiosyötettä.\n"
 
 #  Tässä defaults taitaa olla verbi yksikön kolmannessa persoonassa.
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: 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 ""
-"  -<, --less-than=NUMERO      tulosta viestit, joissa on vähemmän kuin näin monta\n"
-"                              määrittelyä. Oletus ääretön, jos ei ole asetettu\n"
+"  -<, --less-than=NUMERO      tulosta viestit, joissa on vähemmän kuin näin "
+"monta\n"
+"                              määrittelyä. Oletus ääretön, jos ei ole "
+"asetettu\n"
 
-#: src/msgcat.c:412
+#: 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 ""
-"  ->, --more-than=NUMERO      tulosta viestit, jossa on enemmän kuin näin monta\n"
+"  ->, --more-than=NUMERO      tulosta viestit, jossa on enemmän kuin näin "
+"monta\n"
 "                              määrittelyä. Oletus 0, jos ei ole asetettu\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: 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 ""
-"  -u, --unique                pikavalitsin valitsimelle --less-than=2, pyynnöille\n"
+"  -u, --unique                pikavalitsin valitsimelle --less-than=2, "
+"pyynnöille\n"
 "                              että vain uniikkeja viestejä tulostetaan\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:881
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      syötetiedostot ovat Java .properties -syntaksissa\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      syötetiedostot ovat Java .properties -"
+"syntaksissa\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:883
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1279,47 +1631,50 @@ msgstr ""
 "      --stringtable-input     syötetiedostot ovat NeXTstep/GNUstep .strings\n"
 "                              -syntaksissa\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NIMI          koodaus tulosteelle\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             käytä ensimmäistä käytettävissä olevaa käännöstä\n"
-"                              jokaiselle viestille, älä yhdistä useita käännöksiä\n"
+"      --use-first             käytä ensimmäistä käytettävissä olevaa "
+"käännöstä\n"
+"                              jokaiselle viestille, älä yhdistä useita "
+"käännöksiä\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=LUETTELONIMI     aseta ’Language’-kenttä otsakkeessa\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "syötetiedostoja ei annettu"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tarvitaan täsmälleen kaksi syötetiedostoa"
 
 #  Tiedostoihin ref.pot ja def.po viitataan muissa teksteissä, joten ne on paras jättää suomentamatta.
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Käyttö: %s [VALITSIN] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1337,84 +1692,89 @@ msgstr ""
 "ei löydetä tarkkaa täsmäystä, käytetään vajaustäsmäystä tuottamaan parempi\n"
 "diagnostiikka.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      käännökset\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     viitteet lähteisiin\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Toimintomääreet:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          käytä ref.pot-tiedostoa jokaiselle nimiavaruudelle tiedostossa def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          käytä ref.pot-tiedostoa jokaiselle "
+"nimiavaruudelle tiedostossa def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     älä käytä vajaustäsmäystä\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             ota huomioon vajausrivit\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      ota huomioon kääntämättömät rivit\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "tämä viesti on kääntämättä"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "kääntäjän on katselmoitava tämä viesti"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mutta tämä määrittely on samanlainen"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty nimiavaruudessa %s"
+msgstr ""
+"tätä viestiä käytetään, mutta sitä ei ole määritelty nimiavaruudessa %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "varoitus: tätä viestiä ei käytetä"
 
-#: src/msgcmp.c:554 src/msgfmt.c:653 src/msgfmt.c:1444 src/xgettext.c:883
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d vakava virhe"
 msgstr[1] "%d vakavaa virhettä"
 
-#: src/msgcomm.c:317
+#: 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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1435,74 +1795,81 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne. Tiedostosijainnit kaikista PO-tiedostoista kumuloituvat.\n"
 
-#: src/msgcomm.c:403
+#: 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 ""
-"  ->, --more-than=NUMERO      tulostaa viestejä, joissa on enemmän kuin näin\n"
-"                              monta määrittelyä. Oletus 1, jos ei ole asetettu\n"
+"  ->, --more-than=NUMERO      tulostaa viestejä, joissa on enemmän kuin "
+"näin\n"
+"                              monta määrittelyä. Oletus 1, jos ei ole "
+"asetettu\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1061
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           älä kirjoita otsaketta, jossa on ’msgid \"\"’ -rivi\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           älä kirjoita otsaketta, jossa on ’msgid \"\"’ -"
+"rivi\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Muuntaa käännösluettelon eri merkkikoodaukseen.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Muunnoskohde:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Oletuskoodaus on nykyisen paikallisasetuksen koodaus.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                sisennetty tulostetyyli\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           vaienna ’#: filename:line’ -rivit\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          säilytä ’#: filename:line’ -rivit (oletus)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          säilytä ’#: filename:line’ -rivit (oletus)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                tiukka Uniforum-tulostetyyli\n"
 
-#: src/msgen.c:259 src/msgfmt.c:434 src/xgettext.c:692
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "tarvitaan täsmälleen yksi syötetiedosto"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1515,22 +1882,22 @@ msgstr ""
 "ohjelman luoma). Kääntämättömät rivit liitetään käännökseen, joka on\n"
 "identtinen msgid-merkkijonolle.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  SYÖTETIEDOSTO               syötteen PO- tai POT-tiedosto\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "puuttuva komentonimi"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] KOMENTO [KOMENNON VALITSIN]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1545,7 +1912,7 @@ msgstr ""
 "Se tulosteesta tulee msgexec-tuloste. Paluukoodi msgexec-ohjelmalle\n"
 "on kaikkien kutsujen maksimipaluukoodi.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1554,61 +1921,62 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Komentosyöte:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   lisää rivinvaihto syötteen loppuun\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=SYÖTETIEDOSTO   syöte-PO-tiedosto\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "puuttuva suodatinnimi"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "vähintään yksi sed-skripti on määriteltävä"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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:442
+#: src/msgfilter.c:441
 #, 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 ""
-"SUODATIN voi olla mikä tahansa ohjelma, joka lukee käännöksen vakiosyötteestä\n"
+"SUODATIN voi olla mikä tahansa ohjelma, joka lukee käännöksen "
+"vakiosyötteestä\n"
 "ja kirjoittaa muutetun käännöksen vakiotulosteeseen.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Suodatinsyöte ja -tuloste:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1617,239 +1985,279 @@ msgstr ""
 "  --newline                   lisää rivinvaihto syötteen loppuun ja\n"
 "                                poista rivinvaihto tulosteen lopusta"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Hyödylliset SUODATTIMEN VALITSIN-asetukset kun SUODATIN on ’sed’:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SKRIPTI    lisää SKRIPTI suoritettaviin komentoihin\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=SKRIPTI    lisää SKRIPTI suoritettaviin komentoihin\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=SKRIPTITIEDOSTO  lisää SKRIPTITIEDOSTOn sisältö suoritettaviin\n"
 "                                komentoihin\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       vaienna mallitilan automaattinen tulostus\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       vaienna mallitilan automaattinen tulostus\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa (oletus)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa "
+"(oletus)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                sisennetty tulostetyyli\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           pidä otsake muokkaamattomana, älä suodata sitä\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           pidä otsake muokkaamattomana, älä suodata "
+"sitä\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "syötetuloste ei pääty rivinvaihtoon"
 
-#: src/msgfmt.c:346
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentti valitsimeen %s pitäisi olla yksittäinen välimerkki"
 
-#: src/msgfmt.c:393
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "virheellinen endian-tyyppi: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:423 src/msgunfmt.c:269 src/xgettext.c:652
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:440
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "syötetiedostoa ei pitäisi antaa, jos %s ja %s on määritelty"
 
-#: src/msgfmt.c:485 src/msgfmt.c:507 src/msgfmt.c:529 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "valitsin %s vaatii ”-d directory”-määrittelyn"
 
-#: src/msgfmt.c:500 src/msgfmt.c:522 src/msgfmt.c:557 src/msgunfmt.c:324
-#: src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
 
-#: src/msgfmt.c:539
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "valitsin %s vaatii ”--template template”-määrittelyn"
 
-#: src/msgfmt.c:546
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "valitsin %s vaatii ”-o file”-määrittelyn"
 
-#: src/msgfmt.c:552
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "valitsimet %s ja %s ovat toisensa poissulkevia kohteessa %s"
 
-#: src/msgfmt.c:566 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s tai %s kanssa"
 
-#: src/msgfmt.c:572 src/msgfmt.c:578
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s, %s tai %s kanssa"
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "tulostetiedoston ”%s” luominen epäonnistui"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:741
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:745
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d käännetty viesti"
 msgstr[1] "%d käännettyä viestiä"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vajaa käännös"
 msgstr[1] ", %d vajaata käännöstä"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d kääntämätön viesti"
 msgstr[1] ", %d kääntämätöntä viestiä"
 
-#: src/msgfmt.c:775
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 
-#: src/msgfmt.c:779
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta käännöskuvauksesta.\n"
-
-#: src/msgfmt.c:784 src/xgettext.c:913
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
 msgstr ""
-"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
-"Valinnaiset argumentit vastaavasti.\n"
+"Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta "
+"käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:791
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:798 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:962
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
 
-#: src/msgfmt.c:800
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java-tila: tuota Java ResourceBundle -luokka\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java-tila: tuota Java ResourceBundle -luokka\n"
 
-#: src/msgfmt.c:802
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 kuten --java, ja otaksu Java2 (JDK 1.2 tai uudempi)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 kuten --java, ja otaksu Java2 (JDK 1.2 tai "
+"uudempi)\n"
 
-#: src/msgfmt.c:804
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-tila: tuota .NET .dll -tiedosto\n"
 
-#: src/msgfmt.c:806
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-resurssitila: tuota .NET .resources -tiedosto\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-resurssitila: tuota .NET .resources -"
+"tiedosto\n"
 
-#: src/msgfmt.c:808
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-tila: tuotaa tcl/msgcat .msg -tiedosto\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-tila: tuotaa tcl/msgcat .msg -tiedosto\n"
 
-#: src/msgfmt.c:810
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
 
-#: src/msgfmt.c:812
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Työpöytä-syöttötila: tuota .desktop -tiedosto\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Työpöytä-syöttötila: tuota .desktop -tiedosto\n"
 
-#: src/msgfmt.c:819
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ota käyttöön tiukka Uniforum-tila\n"
 
-#: src/msgfmt.c:821 src/xgettext.c:937
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
 
-#: src/msgfmt.c:824
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Tulostetiedostosijainti Java-tilassa:\n"
 
-#: src/msgfmt.c:826 src/msgfmt.c:842 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURSSI     resurssinimi\n"
 
-#: src/msgfmt.c:828 src/msgfmt.c:844 src/msgfmt.c:854 src/msgfmt.c:864
-#: src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
 
-#: src/msgfmt.c:830
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                tuota .java-tiedosto, eikä .class -tiedostoa\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                tuota .java-tiedosto, eikä .class -tiedostoa\n"
 
-#: src/msgfmt.c:832
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d HAKEMISTO                luokkien hakemistohierarkian perushakemisto\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d HAKEMISTO                luokkien hakemistohierarkian perushakemisto\n"
 
-#: src/msgfmt.c:834
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1857,36 +2265,41 @@ msgstr ""
 "erottamalla ne alaviivalla.  Valitsin -d on pakollinen.  Luokka on\n"
 "kirjoitettu määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:840
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Tulostetiedostosijainti C#-tilassa:\n"
 
-#: src/msgfmt.c:846 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d HAKEMISTO                perushakemisto paikallisasetuksista riippuville .dll-tiedostoille\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d HAKEMISTO                perushakemisto paikallisasetuksista "
+"riippuville .dll-tiedostoille\n"
 
-#: src/msgfmt.c:848
+#: src/msgfmt.c:981
 #, 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 ""
-"Valitsimet -l ja -d ovat pakollisia. Tiedosto .dll kirjoitetaan määriteltyyn\n"
+"Valitsimet -l ja -d ovat pakollisia. Tiedosto .dll kirjoitetaan "
+"määriteltyyn\n"
 "alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
 
-#: src/msgfmt.c:852
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tulostetiedostosijainti Tcl-tilassa:\n"
 
-#: src/msgfmt.c:856 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d HAKEMISTO                perushakemisto .msg-viestiluetteloille\n"
 
-#: src/msgfmt.c:858
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1895,22 +2308,23 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg kirjoitetaan\n"
 "määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:862
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Työpyötäsyöttötilan valitsimet:\n"
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=MALLINNE         tiedostoa .desktop käytetään mallinteena\n"
+msgstr ""
+"  --template=MALLINNE         tiedostoa .desktop käytetään mallinteena\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d HAKEMISTO                .po-tiedostojen perushakemisto\n"
 
-#: src/msgfmt.c:872 src/xgettext.c:991
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -1919,175 +2333,211 @@ msgstr ""
 "  -kWORD, --keyword=WORD      etsi WORD-argumentti lisäavainsanana\n"
 "  -k, --keyword               älä käytä oletusavainsanoja\n"
 
-#: src/msgfmt.c:875
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Valitsimet -l, -o, ja --template ovat pakollisia.  Jos valitsin -D määritellään,\n"
+"Valitsimet -l, -o, ja --template ovat pakollisia.  Jos valitsin -D "
+"määritellään,\n"
 "syötetiedostot luetaan hakemistosta eikä komentoriviargumentteina.\n"
 
-#: src/msgfmt.c:887 src/xgettext.c:954
+#: src/msgfmt.c:1012
+#, fuzzy, c-format
+#| msgid "Desktop Entry mode options:\n"
+msgid "XML mode options:\n"
+msgstr "Työpyötäsyöttötilan valitsimet:\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, fuzzy, c-format
+#| msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+"  --template=MALLINNE         tiedostoa .desktop käytetään mallinteena\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
 
-#: src/msgfmt.c:889
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 suorita kaikki tarkistukset, jotka tehdään valitsimilla\n"
-"                                --check-format, --check-header, --check-domain\n"
+"  -c, --check                 suorita kaikki tarkistukset, jotka tehdään "
+"valitsimilla\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:892
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          tarkista kieliriippuvaiset muotomerkkijonot\n"
+msgstr ""
+"      --check-format          tarkista kieliriippuvaiset muotomerkkijonot\n"
 
-#: src/msgfmt.c:894
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          tarkista otsakkeen olemassaolo ja sisältö\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          tarkista otsakkeen olemassaolo ja sisältö\n"
 
-#: src/msgfmt.c:896
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          tarkista nimiavaruusdirektiivien ja valitsimen\n"
+"      --check-domain          tarkista nimiavaruusdirektiivien ja "
+"valitsimen\n"
 "                                --output-file väliset ristiriidat\n"
 
-#: src/msgfmt.c:899
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   tarkista, että GNU msgfmt käyttäytyy kuin X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   tarkista, että GNU msgfmt käyttäytyy kuin X/"
+"Open msgfmt\n"
 
-#: src/msgfmt.c:901
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  tarkista näppäimistöpikavalitsimien olemassaolo\n"
+"      --check-accelerators[=CHAR]  tarkista näppäimistöpikavalitsimien "
+"olemassaolo\n"
 "                                valikkoriveillä\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             käytä vajausmerkintöjä tulosteessa\n"
 
-#: src/msgfmt.c:909
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=NUMERO      tasaa merkkijonot NUMEROon tavuun (oletus: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=NUMERO      tasaa merkkijonot NUMEROon tavuun (oletus: "
+"%d)\n"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=BYTEORDER  kirjoita 32-bittisiä numeroita annetussa endian-\n"
-"                                tavujärjestyksessä (big tai little, oletus riippuu\n"
+"      --endianness=BYTEORDER  kirjoita 32-bittisiä numeroita annetussa "
+"endian-\n"
+"                                tavujärjestyksessä (big tai little, oletus "
+"riippuu\n"
 "                                alustasta)\n"
 
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               binaaritiedosto ei sisällä hash-taulua\n"
 
-#: src/msgfmt.c:923
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            tulosta tilastot käännöksistä\n"
 
-#: src/msgfmt.c:925 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               kasvata laveustasoa\n"
 
-#: src/msgfmt.c:1038
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
 
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
 
-#: src/msgfmt.c:1051
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
-
-#: src/msgfmt.c:1053
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "varoitus: msgfmt:n vanhat versiot antavat tästä virheen\n"
-
-#: src/msgfmt.c:1077
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä"
 
-#: src/msgfmt.c:1082
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä: käyttää etuliitettä"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "’nimiavaruus %s’-direktiivi ohitetaan"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tyhjä ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1157
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1206
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msgfmt.c:1324
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ei ole olemassa"
 
-#: src/msgfmt.c:1335
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s on olemassa, mutta sen lukeminen epäonnistui"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:566
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:164 src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176
-#: src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "valitsinta ’%c’ ei voida käyttää ennen kuin ’J’ tai ’K’ tai ’T’ tai ’C’ tai ’X’ on määritelty"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"valitsinta ’%c’ ei voida käyttää ennen kuin ’J’ tai ’K’ tai ’T’ tai ’C’ tai "
+"’X’ on määritelty"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2097,7 +2547,7 @@ msgstr ""
 "tai kuuluvat johonkin annetuista lähdetiedostoista.\n"
 
 #  Pistekommentti viittaan kommenttiriviin, joka alkaa merkeillä "#. "
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2173,32 +2623,43 @@ msgstr ""
 "  -v, --invert-match          tulosta vain viestit, jotka eivät täsmää mihinkään\n"
 "                              valintakriteeriin\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei laajennettuja merkkejä\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei "
+"laajennettuja merkkejä\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          lajitttele tuloste tiedoston sijainnin perusteella\n"
-
-#: src/msginit.c:298
+msgstr ""
+"      --sort-by-file          lajitttele tuloste tiedoston sijainnin "
+"perusteella\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Olet kielessä, joka poikkea ympäristöstäsi. Aseta LANG-\n"
 "ympäristömuuttuja, kuten kuvaillaan ABOUT-NLS-tiedostossa.\n"
 "Se on välttämätöntä, jotta voit testata käännöksiäsi.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2209,57 +2670,65 @@ msgstr ""
 "Määritä paikallisasetus valitsimen --locale tai\n"
 "tulosteen .po-tiedosot valitsimen --output-file avulla .\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Luotu %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "Luo uuden PO-tiedoston alustaen meta-tiedot arvoilla käyttäjän ympäristöstä.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SYÖTETIEDOSTO   syötteen POT-tiedosto\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Jos syötetiedostoa ei anneta, nykyisestä hakemistosta etsitään POT-tiedosto.\n"
+"Jos syötetiedostoa ei anneta, nykyisestä hakemistosta etsitään POT-"
+"tiedosto.\n"
 "Jos se on -, luetaan vakiosyöte.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn PO-tiedostoon\n"
+msgstr ""
+"  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn PO-tiedostoon\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"Jos tulostetiedostoa ei ole annettu, se riippuu valitsimesta --locale tai käyttäjän\n"
-"paikkallisasetuksista. Jos se on -, tulokset kirjoitetaan vakiotulosteeseen.\n"
+"Jos tulostetiedostoa ei ole annettu, se riippuu valitsimesta --locale tai "
+"käyttäjän\n"
+"paikkallisasetuksista. Jos se on -, tulokset kirjoitetaan "
+"vakiotulosteeseen.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          aseta kohdepaikallisasetus\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         otaksu PO-tiedosto tuotetuksi automaattisesti\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         otaksu PO-tiedosto tuotetuksi automaattisesti\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2267,12 +2736,12 @@ msgstr ""
 "Löytyi useampi kuin yksi .pot-tiedosto.\n"
 "Määritä syötteen .pot-tiedosto valitsimella --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "virhe luettaessa nykyistä hakemistoa"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2280,64 +2749,73 @@ msgstr ""
 "Nykyisestä hakemistosta ei löytynyt .pot-tiedostoa.\n"
 "Määritä syötteen .pot-tiedosto valitsimella --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/msginit.c:1419 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s aliprosessi epäonnistui poistumiskoodilla %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Uuden viestiluettelon pitäisi sisältää sähköpostiosoitteesi, jotta käyttäjät voivat\n"
-"antaa sinulle palautetta käännöksistä, ja jotta ylläpitäjät voivat ottaa yhteyttä\n"
+"Uuden viestiluettelon pitäisi sisältää sähköpostiosoitteesi, jotta käyttäjät "
+"voivat\n"
+"antaa sinulle palautetta käännöksistä, ja jotta ylläpitäjät voivat ottaa "
+"yhteyttä\n"
 "odottamattomissa teknisissä pulmissa.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1616
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Suomenkielinen käännös %s-paketille"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nykyinen merkistö ”%s” ei ole siirrettävä koodausnimi"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "kaksi erilaista merkistöä ”%s” ja ”%s” syötetiedostossa"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "syötetiedostossa ’%s’ ei ole otsaketta, jossa on merkistömäärittely"
 
-#: src/msgl-cat.c:208
+#: 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 "nimiavaruus ”%s” syötetiedostossa ’%s’ ei sisällä otsaketta, jossa on merkistömäärittely"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"nimiavaruus ”%s” syötetiedostossa ’%s’ ei sisällä otsaketta, jossa on "
+"merkistömäärittely"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "kohdemerkistö %s” ei ole siirrettävä koodausnimi."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:554 src/xgettext.c:3532
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2346,18 +2824,20 @@ msgstr ""
 "Syötetiedosto sisältää viestejä eri merkistöissä, mm. UTF-8:na.\n"
 "Muunnetaan tuloste UTF-8:ksi.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Syötetiedostot sisältävät viestejä eri koodauksista, %s ja %s muiden muassa.\n"
+"Syötetiedostot sisältävät viestejä eri koodauksista, %s ja %s muiden "
+"muassa.\n"
 "Muunnetaan tuloste UTF-8 -koodaukseen.\n"
 "Eri tulostekoodauksen valitsemiseksi käytä valitsinta --to-code.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2371,7 +2851,7 @@ msgstr ""
 "ASCII-tekstiksi, tai varmista että ne ovat UTF-8 -koodausta alusta alkaen,\n"
 "ts. jo lähdekooditiedostoissa.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2384,23 +2864,25 @@ msgstr ""
 "Tuloste ’%s’ saattaisi olla virheellinen.\n"
 "Mahdollisia kiertokeinoja ovat:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Aseta LC_ALL paikallisasetukseen, jonka koodaus on %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- Muunna käännösluettelo po-tiedoston paikallisasetukseen %s käyttäen ohjelmaa 'msgconv',\n"
+"- Muunna käännösluettelo po-tiedoston paikallisasetukseen %s käyttäen "
+"ohjelmaa 'msgconv',\n"
 "  käytä sitten ohjelmaa ’%s’,\n"
-"  muunna sitten takaisin po-tiedoston paikallisasetukseen %s käyttäen ohjelmaa 'msgconv'.\n"
+"  muunna sitten takaisin po-tiedoston paikallisasetukseen %s käyttäen "
+"ohjelmaa 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2411,9 +2893,10 @@ msgstr ""
 "- Aseta muuttuja LC_ALL paikallisasetukseen koodauksella %s,\n"
 "  muunna käännösluettelo koodaukseen %s käyttäen ohjelmaa 'msgconv',\n"
 "  käytä sitten ohjelmaa ’%s’,\n"
-"  muunna sitten takaisin po-tiedoston merkistöön %s käyttäen ohjelmaa 'msgconv'.\n"
+"  muunna sitten takaisin po-tiedoston merkistöön %s käyttäen ohjelmaa "
+"'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2424,80 +2907,88 @@ msgstr ""
 "’%s’-tuloste saattaa olla virheellinen.\n"
 "Mahdollinen kiertokeino on asettaa muuttujaan LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "monikkolauseke voi palauttaa negatiivisia arvoja"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, mutta monikkolauseke voi palauttaa jopa arvon %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "monikkolauseke voi aiheuttaa jaon nollalla"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "monikkolauseke voi aiheuttaa kokonaisluvun ylivuodon"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon nollalla"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon "
+"nollalla"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Yritä käyttää seuraavaa, kelvollinen kohteelle %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "viestiluettelossa on monikkomuotoisia käännöksiä"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mutta otsakkeesta puuttuu attribuutti \"plural=LAUSEKE\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mutta otsakkeesta puuttuu \"nplurals=KOKONAISLUKU\"-attribuutti"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "virheellinen nplurals-arvo"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "virheellinen monikkolauseke"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mutta joillakin viesteillä on vain yksi monikkomuoto"
 msgstr[1] "mutta joillakin viesteillä on vain %lu monikkomuotoa"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mutta joillakin viesteillä on yksi monikkomuoto"
 msgstr[1] "mutta joillakin viesteillä on %lu monikkomuotoa"
 
-#: src/msgl-check.c:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "viestiluettelossa on monikkomuotoisia käännöksiä, mutta siitä puuttuu otsakerivi \"Plural-Forms: nplurals=KOKONAISLUKU; plural=LAUSEKE;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"viestiluettelossa on monikkomuotoisia käännöksiä, mutta siitä puuttuu "
+"otsakerivi \"Plural-Forms: nplurals=KOKONAISLUKU; plural=LAUSEKE;\""
 
 #: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "’msgid’ ja ’msgid_plural’ -rivit eivät molemmat ala merkillä ’\\n’"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "’msgid’ ja ’msgstr[%u]’ -rivit eivät molemmat ala merkillä ’\\n’"
@@ -2510,7 +3001,7 @@ msgstr "’msgid’ ja ’msgstr’ -rivit eivät molemmat ala merkillä ’\\n�
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "’msgid’ ja ’msgid_plural’ -rivit eivät molemmat lopu merkillä ’\\n’"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "’msgid’ ja ’msgstr[%u]’ -rivit eivät molemmat lopu merkillä ’\\n’"
@@ -2523,83 +3014,102 @@ msgstr "’msgid’ ja ’msgstr’ -rivit eivät molemmat lopu merkillä ’\\n
 msgid "plural handling is a GNU gettext extension"
 msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "otsakekenttä ’%s’ on edelleen oletusarvossaan\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII-ellipsi (’...’) eikä Unicode-ellipsi"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "välilyönti ennen ellipsiä löytyi käyttäjälle näkyvässä merkkijonossa"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII-kaksoislainausmerkki käytetty eikä Unicode-lainausmerkki"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
-msgstr "ASCII-yksittäismerkkinen lainausmerkki käytetty eikä Unicode-lainausmerkki"
+msgstr ""
+"ASCII-yksittäismerkkinen lainausmerkki käytetty eikä Unicode-lainausmerkki"
+
+#: src/msgl-check.c:1162
+#, fuzzy, c-format
+#| msgid "ASCII ellipsis ('...') instead of Unicode"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII-ellipsi (’...’) eikä Unicode-ellipsi"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: syöte ei ole kelvollinen ”%s”-koodauksessa"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: virhe muunnettaessa ”%s”-koodauksesta ”%s”-koodaukseen"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "syötetiedosto ei sisällä otsaketta, jossa on merkistömäärittely"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/x-python.c:666 src/xgettext.c:751
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää funktiota iconv(), ja iconv() ei tue tätä muunnosta."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää "
+"funktiota iconv(), ja iconv() ei tue tätä muunnosta."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Muunnos koodauksesta ”%s” koodaukseen ”%s” esitteli kaksoiskappaleita: jotkut eri msgid-merkkijonot ovat samoja."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Muunnos koodauksesta ”%s” koodaukseen ”%s” esitteli kaksoiskappaleita: "
+"jotkut eri msgid-merkkijonot ovat samoja."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/x-python.c:673
-#: src/xgettext.c:758
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää funktiota iconv(). Tämä versio on rakennettu ilman funktiota iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää "
+"funktiota iconv(). Tämä versio on rakennettu ilman funktiota iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s kanssa"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "varmuuskopiotyyppi"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2622,17 +3132,19 @@ msgstr ""
 "kommentit ja tiedostosijainnit säilytetään.  Siellä missä ei löydetä\n"
 "tarkkaa täsmäystä, käytetään vajaustäsmäystä paremman tuloksen tuottamiseksi.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      käännökset, jotka viittaavat vanhoihin lähdekoodeihin\n"
+msgstr ""
+"  def.po                      käännökset, jotka viittaavat vanhoihin "
+"lähdekoodeihin\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     viittaa uusiin lähdekoodeihin\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2641,39 +3153,42 @@ msgstr ""
 "  -C, --compendium=TIEDOSTO   viestikäännösten lisäkirjasto,\n"
 "                              saatetaan määritellä useammin kuin kerran\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                päivitä tiedosto def.po,\n"
-"                              älä tee mitään, jos tiedosto def.po on jo ajan tasalla\n"
+"                              älä tee mitään, jos tiedosto def.po on jo ajan "
+"tasalla\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Tulostetiedostosijainti päivitystilassa:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Tulos kirjoitetaan takaisin tiedostoon def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        tee tiedoston def.po varmuuskopio\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=LOPPULIITE     korvaa tavallisen varmuuskopioloppuliitteen\n"
+msgstr ""
+"      --suffix=LOPPULIITE     korvaa tavallisen varmuuskopioloppuliitteen\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2682,113 +3197,143 @@ msgid ""
 msgstr ""
 "Versionhallintamenetelmä voidaan valita valitsimen --backup tai\n"
 "ympäristömuuttujan VERSION_CONTROL avulla.  Tässä ovat arvot:\n"
-"  none, off       varmuuskopioita ei tehdä koskaan (vieläpä kun valitsin --backup on annettu)\n"
+"  none, off       varmuuskopioita ei tehdä koskaan (vieläpä kun valitsin --"
+"backup on annettu)\n"
 "  numbered, t     tee numeroituja varmuuskopioita\n"
-"  existing, nil   numeroidaan, jos numeroituja varmuuskopioita esiintyy, muussa tapauksessa\n"
+"  existing, nil   numeroidaan, jos numeroituja varmuuskopioita esiintyy, "
+"muussa tapauksessa\n"
 "                  yksinkertainen\n"
 "  simple, never   tee aina yksinkertaisia varmuuskopioita\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Varmuuskopioloppuliite on ’~’, ellei ole asetettu valitsimella --suffix tai\n"
 "ympäristömuuttujalla SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              säilytä käännettyjen viestien aikaisemmat msgid-merkkijonot\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              säilytä käännettyjen viestien aikaisemmat "
+"msgid-merkkijonot\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "tämän viestin pitäisi määritellä monikkomuodot"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "tämän viestin ei pitäisi määritellä monikkomuotoja"
 
 #  Ensimmäinen parametri on joko tyhjä merkkijono tai rivinvaihto
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sLuettu %ld vanhaa + %ld viitettä, yhdistettyjä %ld, vajaita %ld, puuttuvia %ld, vanhentuneita %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLuettu %ld vanhaa + %ld viitettä, yhdistettyjä %ld, vajaita %ld, puuttuvia "
+"%ld, vanhentuneita %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " valmis.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "valitsin %s ja eksplisiittiset tiedostonimet ovat toisensa poissulkevia"
+msgstr ""
+"valitsin %s ja eksplisiittiset tiedostonimet ovat toisensa poissulkevia"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Muunna binäärimuotoinen viestiluettelo Uniforum-tyyliseksi .po-tiedostoksi.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java-tila: syöte on Java ResourceBundle -luokka\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java-tila: syöte on Java ResourceBundle -"
+"luokka\n"
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C#-tila: syöte on .NET .dll -tiedosto\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-resurssitila: syöte on .NET .resources -tiedosto\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-resurssitila: syöte on .NET .resources -"
+"tiedosto\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-tila: syöte on tcl/msgcat .msg -tiedosto\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-tila: syöte on tcl/msgcat .msg -tiedosto\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  TIEDOSTO ...                syötteen .mo -tiedostot\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Syötetiedostosijainti Java-tilassa:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Luokkanimi määritellään liittämällä paikallisasetuksen nimi resurssinimeen,\n"
 "erotettun alaviivalla. Luokka sijoitetaan käyttäen muuttujaa CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Syötetiedostosijainti C#-tilassa:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2797,12 +3342,12 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .dll sijoitetaan sellaisen\n"
 "hakemiston alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Syötetiedostosijainti Tcl-tilassa:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2811,17 +3356,17 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg sijaitsee määritellyssä\n"
 "hakemistossa.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                kirjoita sisennettyä tulostetyyliä\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                kirjoita tiukkaa uniforum-tyyliä\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2843,17 +3388,21 @@ msgstr ""
 "käännöksestä.  Tiedostosijainnit kumuloituvat. Kun käytetään valitsinta\n"
 "--unique, kaksoiskappaleet hylätään.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tulosta vain kaksoiskappaleet\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                tulosta vain uniikit viestit, hylkää kaksoiskappaleet\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                tulosta vain uniikit viestit, hylkää "
+"kaksoiskappaleet\n"
 
-#: src/open-catalog.c:57 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 "<vakiosyöte>"
@@ -2914,27 +3463,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "epäjohdonmukainen #~ -käyttö"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "puuttuva ’msgid_plural[]’-rivi"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "puuttuva ’msgid_plural’-rivi"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "puuttuva ’msgstr’-rivi"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ensimmäisellä monikkomuodolla on nollasta poikkeava indeksi"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "monikkomuodolla on väärä indeksi"
@@ -2944,7 +3493,7 @@ msgstr "monikkomuodolla on väärä indeksi"
 msgid "too many errors, aborting"
 msgstr "liian monia virheitä, keskeytetään"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "virheellinen monitavusekvenssi"
@@ -2954,41 +3503,41 @@ msgstr "virheellinen monitavusekvenssi"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "vaillinainen monitavusekvenssi tiedoston lopussa"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vaillinainen monitavusekvenssi rivin lopussa"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv-häiriö"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "avainsana ”%s” tuntematon"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "virheellinen ohjainsekvenssi"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "tiedoston loppu merkkijonon sisällä"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "rivinvaihto merkkijonon sisällä"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontekstierotin <EOT> merkkijonon sisällä"
 
-#: src/read-catalog.c:325 src/xgettext.c:1103
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tämä tiedosto ei ehkä sisällä nimiavaruusdirektiivejä"
@@ -3001,39 +3550,79 @@ msgstr "kaksinkertainen viestimäärittely"
 msgid "this is the location of the first definition"
 msgstr "ensimmäinen määrittely täällä"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+#, fuzzy
+#| msgid "warning: invalid Unicode character"
+msgid "invalid non-blank character"
+msgstr "varoitus: virheellinen Unicode-merkki"
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "puuttuva suodatinnimi"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "virheellinen nplurals-arvo"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "tiedosto ”%s” typistetään"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "tiedosto ”%s” sisältää merkkijonon, jota ei ole päätetty NUL-merkillä"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "tiedosto ”%s” sisältää merkkijonon, jota ei ole päätetty NUL-merkillä"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "tiedosto ”%s” ei ole GNU:n .mo-muodossa"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "tiedosto ”%s” sisältää osoitteessa %s merkkijonon, jota ei ole päätetty NUL-merkillä"
+msgstr ""
+"tiedosto ”%s” sisältää osoitteessa %s merkkijonon, jota ei ole päätetty NUL-"
+"merkillä"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "varoitus: virheellinen \\uxxxx -syntaksi Unicode-merkkille"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: varoitus: yksinäinen sijainen U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "varoitus: virheellinen Unicode-merkki"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "varoitus: päättämätön merkkijono"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "varoitus: syntaksivirhe"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "varoitus: päättämätön avain/arvo-pari"
 
@@ -3041,11 +3630,11 @@ msgstr "varoitus: päättämätön avain/arvo-pari"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "varoitus: syntaksivirhe, odotettiin ’;’ merkkijonon jälkeen"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "varoitus: syntaksivirhe, odotettiin ’=’ tai ’;’ merkkijonon jälkeen"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Kirjoittaneet %s ja %s.\n"
@@ -3054,17 +3643,17 @@ msgstr "Kirjoittaneet %s ja %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
 #  Vai tarkoittaako tämä, että käytetään recode-ohjelmaa?
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Koodaa uudelleen serbiankielinen teksti kyrillisestä latinalaismerkkiseksi skriptiksi.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3073,27 +3662,27 @@ msgstr ""
 "Syöteteksti luetaan vakiosyötteestä.  Muunnettu teksti tulostetaan\n"
 "vakiotulosteeseen.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "syöte ei ole kelvollinen ”%s”-koodauksessa"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "virhe muunnettaessa ”%s”-koodauksesta ”%s”-koodaukseen"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "odotettiin kahta argumenttia"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Käyttö: %s [VALITSIN] VERKKO-OSOITE TIEDOSTO\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3102,114 +3691,141 @@ msgstr ""
 "Noutaa ja tulostaa verkko-osoitteen sisällön.  Jos verkko-osoitetta ei saada,\n"
 "käytetään sen sijaan paikallisesti haettua TIEDOSTOa.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "virhe kirjoitettaessa vakiotulosteeseen"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "virhe tiedoston ”%s” lukemisen jälkeen"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Noudetaan %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " aikavalvonta toimi.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " epäonnistui.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyssä tulostemuodossa epäonnistui. Yritä käyttää sen sijaan PO-tiedostosyntaksia."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyssä "
+"tulostemuodossa epäonnistui. Yritä käyttää sen sijaan PO-tiedostosyntaksia."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyllä tulostemuodolla epäonnistui."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyllä "
+"tulostemuodolla epäonnistui."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "viestiluettelossa on kontekstista riippuvia käännöksiä, mutta tulostemuoto ei tue niitä."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"viestiluettelossa on kontekstista riippuvia käännöksiä, mutta tulostemuoto "
+"ei tue niitä."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "viestiluettelossa on monikkkomuotokäännöksiä, mutta tulostemuoto ei tue niitä. Yritä tuottaa Java-luokka käyttäen komentoa \"msgfmt --java\", eikä ominaisuustiedostoa."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"viestiluettelossa on monikkkomuotokäännöksiä, mutta tulostemuoto ei tue "
+"niitä. Yritä tuottaa Java-luokka käyttäen komentoa \"msgfmt --java\", eikä "
+"ominaisuustiedostoa."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "viestiluettelossa on monikkomuotoisia käännöksiä, mutta tulostemuoto ei tue niitä."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"viestiluettelossa on monikkomuotoisia käännöksiä, mutta tulostemuoto ei tue "
+"niitä."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "tulostetiedoston ”%s” luominen epäonnistui"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "vakiotuloste"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "hakemiston ”%s” luominen epäonnistui"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "epäonnistunut C#-luokan kääntäminen, yritä valitsinta --verbose"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "epäonnistunut C#-luokan kääntäminen"
 
-#: src/write-java.c:1092
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kelvoton Java-luokkanimi: %s"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "epäonnistunut Java-luokan kääntäminen, yritä valitsinta --verbose tai aseta muuttuja $JAVAC"
+msgstr ""
+"epäonnistunut Java-luokan kääntäminen, yritä valitsinta --verbose tai aseta "
+"muuttuja $JAVAC"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVAC"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
-
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "vaillinainen monitavusekvenssi"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "paikallistettujen viestien ei pitäisi sisältää ’\\%c’-koodinvaihtosekvenssiä"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"paikallistettujen viestien ei pitäisi sisältää ’\\%c’-koodinvaihtosekvenssiä"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3223,7 +3839,7 @@ msgstr ""
 "msgctxt-merkkijonon käyttämistä.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3247,12 +3863,15 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"viestiluettelossa on msgctxt-merkkijonoja, jotka sisältävät koodauksen ISO-8859-1\n"
-"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä vain\n"
+"viestiluettelossa on msgctxt-merkkijonoja, jotka sisältävät koodauksen "
+"ISO-8859-1\n"
+"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä "
+"vain\n"
 "käännetyissä merkkijonoissa, ei kontekstimerkkijonoissa\n"
 
 #: src/write-qt.c:718
@@ -3261,16 +3880,18 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"viestiluettelossa on msgid-merkkijonoja, jotka sisältävät koodauksen ISO-8859-1\n"
-"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä vain\n"
+"viestiluettelossa on msgid-merkkijonoja, jotka sisältävät koodauksen "
+"ISO-8859-1\n"
+"ulkopuolisia merkkejä, mutta Qt-viestiluettelomuoto tukee Unicode-merkkejä "
+"vain\n"
 "käännetyissä merkkijonoissa, ei kääntämättömissä merkkijonoissa\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "virhe kirjoitettaessa aliprosessiin %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3278,7 +3899,7 @@ msgstr ""
 "viestiluettelossa on kontekstiriippuvaisia käännöksiä\n"
 "mutta C# .resources -muoto ei tue konteksteja\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3286,7 +3907,7 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä\n"
 "mutta C# .resources -muoto ei tue monikkokäsittelyä\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3294,7 +3915,7 @@ msgstr ""
 "viestiluettelossa on kontekstiriippuvaisia käännöksiä\n"
 "mutta Tcl-viestiluettelomuoto ei tue konteksteja\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3302,36 +3923,56 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä\n"
 "mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varoitus: päättämätön merkkijono"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varoitus: päättämätön säännöllinen lauseke"
 
-#: src/x-c.c:1153
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "varoitus: virheellinen Unicode-merkki"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
 
-#: src/x-c.c:1464 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varoitus: päättämätön merkkivakio"
 
-#: src/x-c.c:1520 src/x-c.c:1571 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
 
-#: src/x-csharp.c:225 src/xgettext.c:2168
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3340,7 +3981,7 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3349,7 +3990,7 @@ msgstr ""
 "%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3358,7 +3999,7 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3367,12 +4008,12 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-häiriö"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3381,60 +4022,430 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: varoitus: päättämätön merkkijonovakio"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: varoitus: ’)’ löytyi kun ’}’ odotettiin"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varoitus: ’}’ löytyi kun ’)’ odotettiin"
 
-#: src/x-glade.c:296
+#: src/xgettext.c:567
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Puuttuva asiayhteys merkkijonolle, joka poimittiin elementistä ’%s’"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+"’%s’ ei ole kelvollinen koodausnimi. Käytetään ASCII-koodia varmistuksena.\n"
 
-#: src/x-glade.c:418
+#: src/xgettext.c:637
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Juurielementti <%s> ei ole sallittu virheettömässä Glade-tiedostossa"
+msgid "syntax check '%s' unknown"
+msgstr "syntaksitarkistus ’%s’ on tuntematon"
 
-#: src/x-glade.c:573 src/x-glade.c:580
+#: src/xgettext.c:646
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgid "sentence end type '%s' unknown"
+msgstr "lauselopputyyppi ’%s’ on tuntematon"
 
-#: src/x-glade.c:607
+#: src/xgettext.c:701
+#, c-format
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr ""
+"valitsimen --join-existing käyttäminen epäonnistui kun tuloste kirjoitetaan "
+"vakiotulosteeseen"
+
+#: src/xgettext.c:705
+#, c-format
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
+
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"Kieltä ”glade” ei tueta. %s turvautuu expat-ohjelmaan.\n"
-"Tämä versio on rakennettu ilman expat-ohjelmaa.\n"
 
-#: src/x-java.c:494
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: varoitus: yksinäinen sijainen U+%04X"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgstr ""
+"varoitus: tiedoston ’%s’ tarkennin ’%s’ on tuntematon; yritetään tarkenninta "
+"C"
+
+#: src/xgettext.c:1027
+#, c-format
+msgid "Extract translatable strings from given input files.\n"
+msgstr "Poimi käännettävät merkkijonot annetuista syötetiedostoista.\n"
+
+#: src/xgettext.c:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NIMI   käytä tiedostoa NIMI.po tulostukseen (eikä "
+"tiedostoa messages.po)\n"
+
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr ""
+"  -o, --output=TIEDOSTO       kirjoita tuloste määriteltyyn tiedostoon\n"
+
+#: src/xgettext.c:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=HAKEMISTO  tulostetiedostot sijoitetaan HAKEMISTOon\n"
+
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Syötetiedoston kielen valinta:\n"
+
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=NIMI         tunnista määritelty kieli\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr ""
+"  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
+
+#: src/xgettext.c:1070
+#, c-format
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Oletuksena kieli on arvattu riippuen syötetiedostonimen tarkentimesta.\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=NIMI        syötetiedostojen koodaus\n"
+"                                (paitsi kielille Python, Tcl, Glade)\n"
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr "Oletuksen syötetiedostojen otaksutaan olevan ASCII-tekstiä.\n"
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr ""
+"  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
+
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr ""
+"  -x, --exclude-file=FILE.po  rivejä tiedostossa FILE.po ei ole poimittu\n"
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cTAG, --add-comments=TAG   sijoita TAG-alkuiset kommenttilohkot ja\n"
+"                                edeltävät avainsanarivit tulostetiedostoon\n"
+"  -c, --add-comments          sijoita kaikkia kommenttilohkoja edeltävät "
+"avainsana-\n"
+"                                rivit tulostetiedostoon\n"
+
+#: src/xgettext.c:1092
+#, fuzzy, c-format
+#| msgid ""
+#| "      --check=NAME            perform syntax check on messages\n"
+#| "                                (ellipsis-unicode, space-ellipsis,\n"
+#| "                                 quote-unicode)\n"
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+"      --check=NIMI            suorita syntaksitarkistus viesteille\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode)\n"
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+"      --sentence-end=TYYPPI   lauseen loppua kuvaileva tyyppi\n"
+"                                (single-space, joka on oletus, \n"
+"                                 tai double-space)\n"
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Kielikohtaiset valitsimet:\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           pura kaikki merkkijonot\n"
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=WORD:ARG:FLAG    lisälippu merkkijonoille avainsanan WORD "
+"argumentti-\n"
+"                              numeron ARG sisällä\n"
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (vain kielille C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
+"  -T, --trigraphs             ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (vain C++-kieli)\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (vain C++-kieli)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   tunnista KDE 4 -muotoiset merkkijonot\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 yksityiskohtaisempi "
+"muotomerkkijonotunnistustulos\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     luo Java .properties -tiedoston\n"
+
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --indent                sisennetty tulostetyyli\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+"      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          ohita FSF copyright-tulosteessa "
+"vieraskieliselle käyttäjälle\n"
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PACKAGE  aseta pakkausnimi tulosteessa\n"
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSION  aseta pakkausversio tulosteessa\n"
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  aseta ilmoitusosoite msgid-"
+"vikailmoituksia varten\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[STRING], --msgstr-prefix[=STRING]  käytä merkkijonoa STRING tai ”” "
+"etuliitteenä msgstr-\n"
+"                                merkkijonon arvoille\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[STRING], --msgstr-suffix[=STRING]  käytä merkkijonoa STRING tai ”” "
+"loppuliitteenä msgstr-\n"
+"                                merkkijonon arvoille\n"
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Argumentilla --flag ei ole <avainsana>:<argumenttinumero>:[pass-]<lippu> -"
+"syntaksia: %s"
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "vakiosyöte"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Valitsinta --msgid-bugs-address ei määritelty.\n"
+"Jos käytät ’Makevars’-tiedostoa, määritä siinä\n"
+"MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
+"määritä komentorivivalitsin --msgid-bugs-address.\n"
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "kieli ’%s’ on tuntematon"
 
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Määritä lähdekoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3443,7 +4454,7 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3452,7 +4463,7 @@ msgstr ""
 "%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3461,7 +4472,7 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3470,7 +4481,7 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3479,533 +4490,452 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: varoitus: RegExp-merkkijonoliteraali päättyi liian aikaisin"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: varoitus: %s ei ole sallittu"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: varoitus: päättämätön XML-merkkaus"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: ei löydetä merkkijonopäättämismerkkiä ”%s” mistään ennen EOF-tiedostonloppumerkkiä"
+msgstr ""
+"%s:%d: ei löydetä merkkijonopäättämismerkkiä ”%s” mistään ennen EOF-"
+"tiedostonloppumerkkiä"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: puuttuu oikea aaltosulje kohteessa \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\l”)"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\u”)"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: virheellinen muuttujainterpolaatio osoitteessa ”%c”"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bitisen merkin ”%c” interpolaatio (”\\L”)"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\U”)"
 
 #: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Tuntematon koodaus ”%s”. Jatketaan sen sijaan ASCII-koodauksella."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: virheellinen merkkijonomäärittely"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: numero puuttuu merkin # jäljestä"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: virheellinen merkkijonolauseke"
 
-#: src/x-sh.c:1075
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: varoitus: syntaksi $\"...\" on vanhentunut turvallisuussyistä; käytä sen sijaan funktiota eval_gettext"
-
-#: src/x-vala.c:414
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: varoitus: säännöllisen lausekkeen merkkijonoliteraali päättyi liian aikaisin"
-
-#: src/xgettext.c:555
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "’%s’ ei ole kelvollinen koodausnimi. Käytetään ASCII-koodia varmistuksena.\n"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: virheellinen merkkijonomäärittely"
 
-#: src/xgettext.c:624
-#, c-format
-msgid "syntax check '%s' unknown"
-msgstr "syntaksitarkistus ’%s’ on tuntematon"
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: virheellinen merkkijonomäärittely"
 
-#: src/xgettext.c:633
+#: src/x-rst.c:691
 #, c-format
-msgid "sentence end type '%s' unknown"
-msgstr "lauselopputyyppi ’%s’ on tuntematon"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/xgettext.c:679
+#: src/x-sh.c:1101
 #, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "valitsimen --join-existing käyttäminen epäonnistui kun tuloste kirjoitetaan vakiotulosteeseen"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: varoitus: syntaksi $\"...\" on vanhentunut turvallisuussyistä; käytä "
+"sen sijaan funktiota eval_gettext"
 
-#: src/xgettext.c:684
+#: src/x-vala.c:616
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr ""
+"%s:%d: varoitus: säännöllisen lausekkeen merkkijonoliteraali päättyi liian "
+"aikaisin"
 
-#: src/xgettext.c:839
-#, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "varoitus: tiedoston ’%s’ tarkennin ’%s’ on tuntematon; yritetään tarkenninta C"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<nimetön>"
 
-#: src/xgettext.c:908
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Poimi käännettävät merkkijonot annetuista syötetiedostoista.\n"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "virheellinen ohjainsekvenssi"
 
-#: src/xgettext.c:931
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NIMI   käytä tiedostoa NIMI.po tulostukseen (eikä tiedostoa messages.po)\n"
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "kelvoton Java-luokkanimi: %s"
 
-#: src/xgettext.c:933
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=TIEDOSTO       kirjoita tuloste määriteltyyn tiedostoon\n"
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "kelvoton Java-luokkanimi: %s"
 
-#: src/xgettext.c:935
-#, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=HAKEMISTO  tulostetiedostot sijoitetaan HAKEMISTOon\n"
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "virheellinen ohjainsekvenssi"
 
-#: src/xgettext.c:940
-#, c-format
-msgid "Choice of input file language:\n"
-msgstr "Syötetiedoston kielen valinta:\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
 
-#: src/xgettext.c:942
-#, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
 msgstr ""
-"  -L, --language=NIMI         tunnista määritelty kieli\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:949
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
 
-#: src/xgettext.c:951
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Oletuksena kieli on arvattu riippuen syötetiedostonimen tarkentimesta.\n"
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
 
-#: src/xgettext.c:956
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
+#: libgettextpo/markup.c:604
+msgid "unknown"
 msgstr ""
-"      --from-code=NIMI        syötetiedostojen koodaus\n"
-"                                (paitsi kielille Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:959
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "Oletuksen syötetiedostojen otaksutaan olevan ASCII-tekstiä.\n"
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "virheellinen endian-tyyppi: %s"
 
-#: src/xgettext.c:964
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
 
-#: src/xgettext.c:966
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=FILE.po  rivejä tiedostossa FILE.po ei ole poimittu\n"
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "virheellinen argumentti %s kontekstille %s"
 
-#: src/xgettext.c:968
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid ""
-"  -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"
+msgid "missing '%c'"
 msgstr ""
-"  -cTAG, --add-comments=TAG   sijoita TAG-alkuiset kommenttilohkot ja\n"
-"                                edeltävät avainsanarivit tulostetiedostoon\n"
-"  -c, --add-comments          sijoita kaikkia kommenttilohkoja edeltävät avainsana-\n"
-"                                rivit tulostetiedostoon\n"
 
-#: src/xgettext.c:973
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid ""
-"      --check=NAME            perform syntax check on messages\n"
-"                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+msgid "missing '%c' or '%c'"
 msgstr ""
-"      --check=NIMI            suorita syntaksitarkistus viesteille\n"
-"                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
 
-#: src/xgettext.c:977
-#, c-format
-msgid ""
-"      --sentence-end=TYPE     type describing the end of sentence\n"
-"                                (single-space, which is the default, \n"
-"                                 or double-space)\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
 msgstr ""
-"      --sentence-end=TYYPPI   lauseen loppua kuvaileva tyyppi\n"
-"                                (single-space, joka on oletus, \n"
-"                                 tai double-space)\n"
 
-#: src/xgettext.c:982
-#, c-format
-msgid "Language specific options:\n"
-msgstr "Kielikohtaiset valitsimet:\n"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
 
-#: src/xgettext.c:984
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           pura kaikki merkkijonot\n"
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
 
-#: src/xgettext.c:986
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
 msgstr ""
-"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:994
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
 msgstr ""
-"                                (vain kielet C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:999
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
 msgstr ""
-"      --flag=WORD:ARG:FLAG    lisälippu merkkijonoille avainsanan WORD argumentti-\n"
-"                              numeron ARG sisällä\n"
 
-#: src/xgettext.c:1002
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
 msgstr ""
-"                                (vain kielille C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1007
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "puuttuva suodatinnimi"
 
-#: src/xgettext.c:1009
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
 
-#: src/xgettext.c:1011
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
 
-#: src/xgettext.c:1013 src/xgettext.c:1017 src/xgettext.c:1021
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (vain C++-kieli)\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
 
-#: src/xgettext.c:1015
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   tunnista KDE 4 -muotoiset merkkijonot\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
 
-#: src/xgettext.c:1019
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
 
-#: src/xgettext.c:1023
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 yksityiskohtaisempi muotomerkkijonotunnistustulos\n"
+msgid "document ended unexpectedly: %s"
+msgstr ""
 
-#: src/xgettext.c:1048
 #, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     luo Java .properties -tiedoston\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
 
-#: src/xgettext.c:1063
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: tunnistamaton valitsin ’--%s’\n"
 
-#: src/xgettext.c:1065
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          ohita FSF copyright-tulosteessa vieraskieliselle käyttäjälle\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
 
-#: src/xgettext.c:1067
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=PACKAGE  aseta pakkausnimi tulosteessa\n"
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
 
-#: src/xgettext.c:1069
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSION  aseta pakkausversio tulosteessa\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
 
-#: src/xgettext.c:1071
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  aseta ilmoitusosoite msgid-vikailmoituksia varten\n"
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
 
-#: src/xgettext.c:1073
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]  käytä merkkijonoa STRING tai ”” etuliitteenä msgstr-\n"
-"                                merkkijonon arvoille\n"
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "varoitus: msgfmt:n vanhat versiot antavat tästä virheen\n"
 
-#: src/xgettext.c:1076
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -M[STRING], --msgstr-suffix[=STRING]  käytä merkkijonoa STRING tai ”” loppuliitteenä msgstr-\n"
-"                                merkkijonon arvoille\n"
+#~ msgid "Missing context for the string extracted from '%s' element"
+#~ msgstr "Puuttuva asiayhteys merkkijonolle, joka poimittiin elementistä ’%s’"
 
-#: src/xgettext.c:1902
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Argumentilla --flag ei ole <avainsana>:<argumenttinumero>:[pass-]<lippu> -syntaksia: %s"
-
-#: src/xgettext.c:2027
-msgid "standard input"
-msgstr "vakiosyöte"
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
 
-#: src/xgettext.c:2133
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Ei-ASCII-merkki osoitteessa %s%s."
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Kieltä ”glade” ei tueta. %s turvautuu expat-ohjelmaan.\n"
+#~ "Tämä versio on rakennettu ilman expat-ohjelmaa.\n"
 
-#: src/xgettext.c:2137
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Ei-ASCII-merkki osoitteessa %s%s."
 
-#: src/xgettext.c:2142
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
 
-#: src/xgettext.c:2248 src/xgettext.c:2281 src/xgettext.c:2346
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: varoitus: "
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
 
-#: src/xgettext.c:2251
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Vaikka käytetty muotomerkkijonopaikassa, merkkijono %s ei ole kelvollinen %s-muotomerkkijono. Syy: %s\n"
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: varoitus: "
 
-#: src/xgettext.c:2252
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Vaikka esitelty sellaisena, merkkijono %s ei ole kelvollinen %s-muotomerkkijono. Syy: %s\n"
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Vaikka käytetty muotomerkkijonopaikassa, merkkijono %s ei ole kelvollinen "
+#~ "%s-muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:2283
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"’%s’-muotomerkkijonon kotoistaminen oikein nimeättömillä argumenteilla epäonnistui:\n"
-"Kääntäjän argumenttien uudelleenjärjestäminen epäonnistui.\n"
-"Harkitse muotomerkkijonon käyttämistä nimetyillä argumenteilla,\n"
-"ja kartoittamalla eikä argumenttien monilla.\n"
-
-#: src/xgettext.c:2348
-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 ""
-"Tyhjä msgid-merkkijono.  GNU gettext on varannut sen:\n"
-"gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
-"ei tyhjää merkkijonoa.\n"
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Vaikka esitelty sellaisena, merkkijono %s ei ole kelvollinen %s-"
+#~ "muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:3085
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "’%s’-muotomerkkijonon kotoistaminen oikein nimeättömillä argumenteilla "
+#~ "epäonnistui:\n"
+#~ "Kääntäjän argumenttien uudelleenjärjestäminen epäonnistui.\n"
+#~ "Harkitse muotomerkkijonon käyttämistä nimetyillä argumenteilla,\n"
+#~ "ja kartoittamalla eikä argumenttien monilla.\n"
 
-#: src/xgettext.c:3112
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
+#~ 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 ""
+#~ "Tyhjä msgid-merkkijono.  GNU gettext on varannut sen:\n"
+#~ "gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
+#~ "ei tyhjää merkkijonoa.\n"
 
-#: src/xgettext.c:3137
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
 
-#: src/xgettext.c:3158
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
 
-#: src/xgettext.c:3533
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"Valitsinta --msgid-bugs-address ei määritelty.\n"
-"Jos käytät ’Makevars’-tiedostoa, määritä siinä\n"
-"MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
-"määritä komentorivivalitsin --msgid-bugs-address.\n"
-
-#: src/xgettext.c:3753
 #, c-format
-msgid "language '%s' unknown"
-msgstr "kieli ’%s’ on tuntematon"
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
 
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<nimetön>"
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
 
 #~ msgid "header field '%s' should start at beginning of line\n"
 #~ msgstr "otsakekentän ’%s’ pitäisi alkaa rivin alusta\n"
@@ -4031,13 +4961,19 @@ msgstr "<nimetön>"
 #~ msgid "Substitutes the values of environment variables.\n"
 #~ msgstr "Korvaa ympäristömuuttujien arvot.\n"
 
-#~ msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-#~ msgstr "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät muuttujat\n"
+#~ msgid ""
+#~ "  -v, --variables             output the variables occurring in SHELL-"
+#~ "FORMAT\n"
+#~ msgstr ""
+#~ "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät "
+#~ "muuttujat\n"
 
 #~ msgid ""
 #~ "In normal operation mode, standard input is copied to standard output,\n"
-#~ "with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
-#~ "being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
+#~ "with references to environment variables of the form $VARIABLE or "
+#~ "${VARIABLE}\n"
+#~ "being replaced with the corresponding values.  If a SHELL-FORMAT is "
+#~ "given,\n"
 #~ "only those environment variables that are referenced in SHELL-FORMAT are\n"
 #~ "substituted; otherwise all environment variables references occurring in\n"
 #~ "standard input are substituted.\n"
@@ -4050,8 +4986,10 @@ msgstr "<nimetön>"
 #~ "ympäristömuuttujat korvataan.\n"
 
 #~ msgid ""
-#~ "When --variables is used, standard input is ignored, and the output consists\n"
-#~ "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
+#~ "When --variables is used, standard input is ignored, and the output "
+#~ "consists\n"
+#~ "of the environment variables that are referenced in SHELL-FORMAT, one per "
+#~ "line.\n"
 #~ msgstr ""
 #~ "Valitsinta --variables käytettäessä vakiosyöte jätetään huomiotta ja\n"
 #~ "tuloste muodostuu ympäristömuuttujista, yksi kutakin riviä kohti,\n"
@@ -4084,22 +5022,29 @@ msgstr "<nimetön>"
 #~ "  -n                        jättää pois rivinvaihdon rivin lopusta\n"
 #~ "  -V, --version             näyttää ohjelmiston versiotiedot ja lopettaa\n"
 #~ "                            suorituksen\n"
-#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-ID:tä\n"
+#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-"
+#~ "ID:tä\n"
 #~ "                            KÄÄNNÖSJOUKOSSA\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
 #~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
-#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
 #~ "jalla TEXTDOMAINDIR.\n"
 #~ "Valitsimen -s kanssa ohjelma toimii kuten ”echo”-komento.\n"
 #~ "Ohjelma ei kuitenkaan vain kopioi argumenttejaan vakiotulosteeseen, vaan\n"
@@ -4107,10 +5052,12 @@ msgstr "<nimetön>"
 #~ "Perushakemisto, josta haku suoritetaan: %s\n"
 
 #~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ msgstr "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
+#~ msgstr ""
+#~ "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
 
 #~ msgid ""
-#~ "Display native language translation of a textual message whose grammatical\n"
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
 #~ "form depends on a number.\n"
 #~ msgstr ""
 #~ "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille, jonka muoto\n"
@@ -4123,28 +5070,35 @@ msgstr "<nimetön>"
 #~ "  -h, --help                display this help and exit\n"
 #~ "  -V, --version             display version information and exit\n"
 #~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
 #~ msgstr ""
 #~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
 #~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
 #~ "  -h, --help                näytä tämä ohje ja poistu\n"
 #~ "  -V, --version             näytä versiotiedot ja poistu\n"
 #~ "  [KÄÄNNÖSJOUKKO]           hae käännetty sanoma KÄÄNNÖSJOUKOSTA\n"
-#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON (monikko)\n"
+#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON "
+#~ "(monikko)\n"
 #~ "  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
 #~ "                              perusteella\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
 #~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
-#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
 #~ "jalla TEXTDOMAINDIR.\n"
 #~ "Perushakemisto, josta haku suoritetaan: %s\n"
 
@@ -4164,13 +5118,18 @@ msgstr "<nimetön>"
 #~ msgstr "       getopt [valitsimet] [--] valitsinmerkkijono parametrit\n"
 
 #~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] [--]\n"
+#~ msgstr ""
+#~ "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
+#~ "[--]\n"
 
 #~ msgid "              parameters\n"
 #~ msgstr "              parametrit\n"
 
-#~ msgid "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr "  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:lla\n"
+#~ msgid ""
+#~ "  -a, --alternative            Allow long options starting with single -\n"
+#~ msgstr ""
+#~ "  -a, --alternative            Salli pitkien valitsimien alkaminen "
+#~ "yhdellä -:lla\n"
 
 #~ msgid "  -h, --help                   This small usage guide\n"
 #~ msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
@@ -4178,14 +5137,19 @@ msgstr "<nimetön>"
 #~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 #~ msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
 
-#~ msgid "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
+#~ msgid ""
+#~ "  -n, --name=progname          The name under which errors are reported\n"
+#~ msgstr ""
+#~ "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden "
+#~ "yhteydessä\n"
 
 #~ msgid "  -o, --options=optstring      Short options to be recognized\n"
 #~ msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
 
-#~ msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
+#~ msgid ""
+#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+#~ msgstr ""
+#~ "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
 
 #~ msgid "  -Q, --quiet-output           No normal output\n"
 #~ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
@@ -4199,9 +5163,6 @@ msgstr "<nimetön>"
 #~ msgid "  -u, --unqote                 Do not quote the output\n"
 #~ msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
 
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Näytä versiotiedot\n"
-
 #~ msgid "missing optstring argument"
 #~ msgstr "puuttuva valitsinmerkkijonon argumentti"
 
@@ -4213,12 +5174,16 @@ msgstr "<nimetön>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright © %s Free Software Foundation, Inc.\n"
-#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. Ohjelmistolle\n"
-#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE TIETTYYN\n"
+#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. "
+#~ "Ohjelmistolle\n"
+#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
+#~ "TIETTYYN\n"
 #~ "tarkoitukseen.\n"
 
 #~ msgid "write to grep subprocess failed"
@@ -4230,7 +5195,8 @@ msgstr "<nimetön>"
 #~ "  -V, --version                  output version information and exit\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 
 #~ msgid ""
@@ -4241,7 +5207,8 @@ msgstr "<nimetön>"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "      --statistics            tulostaa tilastot käännöksistä\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
@@ -4254,7 +5221,8 @@ msgstr "<nimetön>"
 #~ "  -q, --quiet, --silent       suppress progress indicators\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
 #~ "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
@@ -4266,6 +5234,7 @@ msgstr "<nimetön>"
 #~ "  -v, --verbose            increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index 2c6e427b9..4d5ca80d2 100644
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-01 23:51+0200\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -19,31 +19,35 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "Argument invalide « %s » pour « %s »"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "Argument ambigu %s pour %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont :"
 
 #: gnulib-lib/clean-temp.c:325
 #, 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"
+msgstr ""
+"Impossible de trouver un répertoire temporaire. Essayez de définir la "
+"variable $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:339
 #, 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 »"
+msgstr ""
+"Impossible de créer un répertoire temporaire en utilisant le modèle « %s »"
 
 #: gnulib-lib/clean-temp.c:435
 #, c-format
@@ -59,201 +63,188 @@ msgstr "Impossible de supprimer le dossier temporaire « %s »"
 msgid "write error"
 msgstr "Erreur d'écriture"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "préserver les permissions de %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "erreur lors de l'ouverture de « %s » en lecture"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, 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:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "erreur de lecture de « %s »"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "erreur d'écriture de « %s »"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "Échec de la fonction « fdopen() »"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Le compilateur C# est introuvable. Essayez d'installer « pnet »"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "La machine virtuelle C# est introuvable. Essayez d'installer « pnet »"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Échec du sous-processus %s"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s : l'option « %s » est ambiguë ; choix possibles :"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s : l'option « %s » est ambiguë ; choix possibles :"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s : l'option « %c%s » n'est pas connue\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s : l'option « --%s » requiert un argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s : l'option « --%s » n'est pas connue\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s : l'option « %c%s » n'est pas connue\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : option non valable -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option exige un argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s : l'option « -W %s » est ambiguë\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s : l'option « -W %s » requiert un argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argument source_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argument target_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Échec lors de la création de « %s »"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Erreur pendant l'écriture du fichier « %s »"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Le compilateur Java est introuvable. Essayez d'installer « gcj » ou de définir la variable d'environnement $JAVAC"
+msgstr ""
+"Le compilateur Java est introuvable. Essayez d'installer « gcj » ou de "
+"définir la variable d'environnement $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "La machine virtuelle Java est introuvable. Essayez d'installer « gij » ou de définir la variable d'environnement $JAVA"
+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:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Erreur d'E/S du sous-processus %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "création des threads échouée"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Échec d'écriture sur le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "Échec de lecture depuis le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, 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"
+msgstr ""
+"Impossible d'établir des entrées/sorties non bloquantes pour le sous-"
+"processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "Échec de communication avec le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "Sous-processus %s terminé avec le code de sortie %d"
@@ -277,13 +268,13 @@ msgstr "Sous-processus %s terminé avec le code de sortie %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "« "
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr " »"
 
@@ -292,64 +283,69 @@ msgstr " »"
 msgid "setting permissions for %s"
 msgstr "configuration des permissions pour %s "
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "Création du tube impossible"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Échec de la fonction « _open_osfhandle »"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "Impossible de restorer le descripteur de fichier %d : dup2 a échoué"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "sous-processus %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Le sous-processus %s a reçu le signal fatal %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "L’élément racine doit être <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "L'élément racine <%s> n'est pas autorisé dans un élément <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "L’élément <%s> n’a pas d’attribut <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Usage : %s [OPTION…] [RÉGLES LOCALES]…\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -364,7 +360,7 @@ msgstr ""
 "de LOCALE depuis RÉGLES et les affiche sous au format de gettext.\n"
 "Si aucun argument n’est passé, il lit les règles de pluriel CLDR depuis l’entrée standard.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,27 +369,28 @@ msgstr ""
 "Les arguments obligatoires pour les formes longues des options sont également\n"
 "obligatoires pour les formes courtes correspondantes. (idem options factultatives)\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  afficher les règles de pluriel au format CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  afficher les règles de pluriel au format CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, 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/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, 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"
@@ -402,25 +399,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -429,139 +431,172 @@ 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/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s ne peut être lu"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "Impossible d’extraire les règles de %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "impossible d’analyser le règle CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "opèrande supplémentaire %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "Une spécification de format pour l'argument «·%u·», comme dans « %s », n'existe pas dans « %s »"
+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·», comme dans « %s », "
+"n'existe pas dans « %s »"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "Les spécifications de format dans « %s » et « %s » pour l'argument %u ne sont pas identiques"
+msgstr ""
+"Les spécifications de format dans « %s » et « %s » pour l'argument %u ne "
+"sont pas identiques"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "La directive numéro %u commence par « | » mais ne se termine pas par « | »."
+msgstr ""
+"La directive numéro %u commence par « | » mais ne se termine pas par « | »."
 
 #: src/format.c:152
 #, 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 à « %s ». Raison : %s"
+msgstr ""
+"« %s » n'est pas une chaîne de format %s valide, contrairement à « %s ». "
+"Raison : %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Dans la directive numéro %u, le mot qui suit le symbole « < » n'est pas le nom d'une macro de spécification de format. Les noms valides de macro sont listés dans la norme ISO C 99 section 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Dans la directive numéro %u, le mot qui suit le symbole « < » n'est pas le "
+"nom d'une macro de spécification de format. Les noms valides de macro sont "
+"listés dans la norme ISO C 99 section 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Dans la directive numéro %u, le mot après le symbole « < » n'est pas suivi par « > »."
+msgstr ""
+"Dans la directive numéro %u, le mot après le symbole « < » n'est pas suivi "
+"par « > »."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"La chaîne fait appel à l'argument numéro %u mais ignore l'argument numéro %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, 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 « %s » et « %s »."
+msgstr ""
+"Il n'y a pas le même nombre de spécifications de format entre « %s » et "
+"« %s »."
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Dans la directive numéro %u, le symbole « { » n'est pas suivi par un numéro d'argument."
+msgstr ""
+"Dans la directive numéro %u, le symbole « { » n'est pas suivi par un numéro "
+"d'argument."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "Dans la directive numéro %u, le symbole « , » n'est pas suivi par un nombre"
+msgstr ""
+"Dans la directive numéro %u, le symbole « , » n'est pas suivi par un nombre"
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "La chaîne se termine au milieu d'une directive : un symbole « { » a été trouvé sans le symbole « } » correspondant."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"La chaîne se termine au milieu d'une directive : un symbole « { » a été "
+"trouvé sans le symbole « } » correspondant."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-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 « } »."
+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 « } »."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "La directive numéro %u se termine par un caractère invalide au lieu de « } »."
+msgstr ""
+"La directive numéro %u se termine par un caractère invalide au lieu de « } »."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "La chaîne débute dans le milieu d'une directive: un symbole « } » a été trouvé sans le symbole « { » correspondant."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"La chaîne débute dans le milieu d'une directive: un symbole « } » a été "
+"trouvé sans le symbole « { » correspondant."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 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"
+msgstr ""
+"La chaîne contient un caractère « } » solitaire après la directive numéro %u"
 
 #: src/format-gcc-internal.c:255
 #, c-format
@@ -571,17 +606,26 @@ msgstr "Dans la directive numéro %u, la combinaison des  est invalide"
 #: 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 »."
+msgstr ""
+"Dans la directive numéro %u, une précision n'est pas permise avant « %c »."
 
 #: 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 "Dans la directive numéro %u, le nombre d'arguments pour la précision doit être égal à %u"
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Dans la directive numéro %u, le nombre d'arguments pour la précision doit "
+"être égal à %u"
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Dans la directive numéro %u, une indication de précision n'est pas permise avant « %c »."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Dans la directive numéro %u, une indication de précision n'est pas permise "
+"avant « %c »."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -591,7 +635,8 @@ msgstr "Dans la directive numéro %u, l'indication de précision est incorrecte.
 #: 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 »."
+msgstr ""
+"Dans la directive numéro %u, les drapeaux ne sont pas permis avant « %c »."
 
 #: src/format-gcc-internal.c:677
 #, c-format
@@ -618,93 +663,146 @@ msgid "The string ends in the middle of a directive."
 msgstr "La chaîne se termine au milieu d'une directive."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "La chaîne mentionne des arguments de deux façons différentes : avec des numéros absolus d'arguments et avec des spécifications d'arguments non numérotées"
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"La chaîne mentionne des arguments de deux façons différentes : avec des "
+"numéros absolus d'arguments et avec des spécifications d'arguments non "
+"numérotées"
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "Dans la directive numéro %u, l'argument numéro 0 n'est pas un nombre entier positif"
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"Dans la directive numéro %u, l'argument numéro 0 n'est pas un nombre entier "
+"positif"
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Dans la directive numéro %u, l'argument de largeur numéro 0 n'est pas un nombre entier positif"
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Dans la directive numéro %u, l'argument de largeur numéro 0 n'est pas un "
+"nombre entier positif"
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Dans la directive numéro %u, l'argument de précision numéro 0 n'est pas un nombre entier positif"
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Dans la directive numéro %u, l'argument de précision numéro 0 n'est pas un "
+"nombre entier positif"
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "Dans la directive numéro %u, le caractère « %c » n'est pas un spécificateur de conversion valide."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"Dans la directive numéro %u, le caractère « %c » n'est pas un spécificateur "
+"de conversion valide."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Le caractère qui termine la directive numéro %u n'est pas un spécificateur de conversion valide."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Le caractère qui termine la directive numéro %u n'est pas un spécificateur "
+"de conversion valide."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "La chaîne fait référence à l'argument numéro %u de manière incompatible."
+msgstr ""
+"La chaîne fait référence à l'argument numéro %u de manière incompatible."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "Dans la directive numéro %u, la sous-chaîne « %s » n'a pas un format de date/heure valide."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"Dans la directive numéro %u, la sous-chaîne « %s » n'a pas un format de date/"
+"heure valide."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Dans la directive numéro %u, « %s » n'est pas suivi par une virgule."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Dans la directive numéro %u, la sous-chaîne « %s » n'a pas un format de nombre valide"
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Dans la directive numéro %u, la sous-chaîne « %s » n'a pas un format de "
+"nombre valide"
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Dans la directive numéro %u, le numéro d'argument n'est pas suivi par une virgule puis par « %s », « %s », « %s », ou « %s »."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Dans la directive numéro %u, le numéro d'argument n'est pas suivi par une "
+"virgule puis par « %s », « %s », « %s », ou « %s »."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Dans la directive numéro %u, l'un des choix ne contient aucun numéro"
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Dans la directive numéro %u, l'un des choix contient un numéro qui n'est pas suivi par « < », « # » ou « %s »."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Dans la directive numéro %u, l'un des choix contient un numéro qui n'est pas "
+"suivi par « < », « # » ou « %s »."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-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}, comme dans « %s ». n'existe pas dans « %s »"
+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}, comme dans « %s ». "
+"n'existe pas dans « %s »"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "Les spécifications de format dans « %s » et « %s » pour l'argument {%u} ne sont pas les mêmes"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"Les spécifications de format dans « %s » et « %s » pour l'argument {%u} ne "
+"sont pas les mêmes"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "La chaîne fait appel à l'argument numéro %u mais ignore les arguments numéros %u et %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"La chaîne fait appel à l'argument numéro %u mais ignore les arguments "
+"numéros %u et %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "Une spécification de format pour les arguments %u et %u n’existe pas dans « %s » ; seulement un argument peut être ignoré"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"Une spécification de format pour les arguments %u et %u n’existe pas dans "
+"« %s » ; seulement un argument peut être ignoré"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -715,15 +813,27 @@ msgstr "erreur lors de l’analyse : %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Dans la directive numéro %u, le paramètre %u est de type « %s » mais il manque un paramètre pour le type « %s »."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Dans la directive numéro %u, le paramètre %u est de type « %s » mais il "
+"manque un paramètre pour le type « %s »."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Dans la directive numéro %u, trop de paramètres sont fournis (il en faut %u au maximum)."
-msgstr[1] "Dans la directive numéro %u, trop de paramètres sont fournis (il en faut %u au maximum)."
+msgid ""
+"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."
+msgstr[0] ""
+"Dans la directive numéro %u, trop de paramètres sont fournis (il en faut %u "
+"au maximum)."
+msgstr[1] ""
+"Dans la directive numéro %u, trop de paramètres sont fournis (il en faut %u "
+"au maximum)."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -749,17 +859,24 @@ msgstr "« ~%c » a été trouvé sans « ~%c » correspondant."
 #: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Dans la directive numéro %u, les deux modificateurs « @ » et « : » sont fournis."
+msgstr ""
+"Dans la directive numéro %u, les deux modificateurs « @ » et « : » sont "
+"fournis."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Dans la directive numéro %u, « ~:[ » n'est pas suivi par deux clauses, séparées par « ~; »."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Dans la directive numéro %u, « ~:[ » n'est pas suivi par deux clauses, "
+"séparées par « ~; »."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, 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:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
@@ -768,52 +885,70 @@ msgstr "La chaîne fait référence à un argument de manière incompatible."
 #: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "Les spécifications de format dans « %s » et « %s » ne sont pas équivalentes"
+msgstr ""
+"Les spécifications de format dans « %s » et « %s » ne sont pas équivalentes"
 
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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 « %s »."
+msgstr ""
+"Les spécifications de format dans « %s » ne sont pas un sous-ensemble de "
+"celles de « %s »."
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Dans la directive numéro %u, l'indicateur de taille est incompatible avec l'indicateur de conversion « %c »."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Dans la directive numéro %u, l'indicateur de taille est incompatible avec "
+"l'indicateur de conversion « %c »."
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Dans la directive numéro %u, « %c » ne peut pas débuter un nom de champ."
+msgstr ""
+"Dans la directive numéro %u, « %c » ne peut pas débuter un nom de champ."
 
 #: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "Dans la directive numéro %u, « %c » ne peut pas débuter un argument getattr."
+msgstr ""
+"Dans la directive numéro %u, « %c » ne peut pas débuter un argument getattr."
 
 #: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Dans la directive numéro %u, « %c » ne peut pas débuter un argument getitem."
+msgstr ""
+"Dans la directive numéro %u, « %c » ne peut pas débuter un argument getitem."
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "Dans la directive numéro %u, aucune imbrication supplémentaire n'est permise dans le spécificateur de format."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Dans la directive numéro %u, aucune imbrication supplémentaire n'est permise "
+"dans le spécificateur de format."
 
 #: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Dans la directive numéro %u, il y a une directive de format indéterminée."
+msgstr ""
+"Dans la directive numéro %u, il y a une directive de format indéterminée."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-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."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+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:354
 #, c-format
@@ -822,112 +957,149 @@ msgstr "La chaîne fait référence à l'argument « %s » de manière incompa
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "Les spécifications de format dans « %s » requièrent une carte de correspondance, celles de « %s » requièrent un n-uplet."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"Les spécifications de format dans « %s » requièrent une carte de "
+"correspondance, celles de « %s » requièrent un n-uplet."
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "Les spécifications de format dans « %s » requièrent un n-uplet (tuple), celles de « %s » requièrent une carte de correspondance (mapping)."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"Les spécifications de format dans « %s » requièrent un n-uplet (tuple), "
+"celles de « %s » requièrent une carte de correspondance (mapping)."
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "Une spécification de format pour l'argument « %s », comme dans « %s », n'existe pas dans « %s »"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"Une spécification de format pour l'argument « %s », comme dans « %s », "
+"n'existe pas dans « %s »"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "Les spécifications de format dans « %s » et « %s » pour l'argument « %s » ne sont pas les mêmes"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"Les spécifications de format dans « %s » et « %s » pour l'argument « %s » ne "
+"sont pas les mêmes"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "« %s » est une simple chaîne de format, mais « %s » n'en est pas une : elle contient un drapeau « L » ou un nombre d'arguments à deux chiffres"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"« %s » est une simple chaîne de format, mais « %s » n'en est pas une : elle "
+"contient un drapeau « L » ou un nombre d'arguments à deux chiffres"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "La chaîne fait référence à une variable de shell avec un nom qui n'est pas au format ASCII."
+msgstr ""
+"La chaîne fait référence à une variable de shell avec un nom qui n'est pas "
+"au format ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "La chaîne fait référence à une variable de shell avec une syntaxe d'accolades complexe. Cette syntaxe n'est pas supportée ici pour des raisons de sécurité."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"La chaîne fait référence à une variable de shell avec une syntaxe "
+"d'accolades complexe. Cette syntaxe n'est pas supportée ici pour des raisons "
+"de sécurité."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "La chaîne fait référence à une variable de shell dont la valeur peut être différente à l'intérieur des fonctions du shell."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"La chaîne fait référence à une variable de shell dont la valeur peut être "
+"différente à l'intérieur des fonctions du shell."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "La chaîne fait référence à une variable de shell avec un nom vide."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-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."
+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."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Le caractère qui termine la directive numéro %u n'est pas un chiffre compris entre 1 et 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Le caractère qui termine la directive numéro %u n'est pas un chiffre compris "
+"entre 1 et 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "Trop d'arguments"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage : %s [OPTION]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Ce programme affiche le nom de machine.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de sortie :\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nom de machine court\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          nom de machine long, incluant le nom de domaine pleinement qualifié\n"
+"  -f, --fqdn, --long          nom de machine long, incluant le nom de "
+"domaine pleinement qualifié\n"
 "                              et les alias\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresses IP du nom de machine\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "Impossible d'obtenir le nom de machine"
@@ -937,7 +1109,7 @@ msgstr "Impossible d'obtenir le nom de machine"
 msgid "selector is not specified"
 msgstr "sélécteur non spécifié"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "impossible de créer un contexte XPath"
@@ -947,28 +1119,28 @@ msgstr "impossible de créer un contexte XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "impossible d’évaluer l’expression XPath : %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "le nœud « %s » ne contient pas « %s »"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "Argument invalide « %s » pour « %s »"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "l’élément racine n’est pas une « règle » de l’espace de nom %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "lecture impossible de %s : %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "impossible d’évaluer l’adresse XPath : %s"
@@ -988,28 +1160,28 @@ msgstr "Impossible de lire le fichier XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "l’élément racine n’est pas « locatingRules »"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1018,62 +1190,69 @@ 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:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Les arguments obligatoires pour les formes longues des options sont également\n"
+"Les arguments obligatoires pour les formes longues des options sont "
+"également\n"
 "obligatoires pour les formes courtes correspondantes.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHIER                     fichier PO d'entrée\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DOSSIER     ajouter le DOSSIER pour la recherche des fichiers d'entrée\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DOSSIER     ajouter le DOSSIER pour la recherche des "
+"fichiers d'entrée\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+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:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1082,259 +1261,324 @@ 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:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Sélection des messages :\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            conserver les messages traduit, retirer les messages non traduits\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            conserver les messages traduit, retirer les "
+"messages non traduits\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          conserver les messages non traduits, retirer les messages traduits\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          conserver les messages non traduits, retirer "
+"les messages traduits\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            conserver seulement les messages marqués « fuzzy »\n"
+msgstr ""
+"      --only-fuzzy            conserver seulement les messages marqués "
+"« fuzzy »\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           retirer les messages obsolètes « #~ »\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         conserver seulement les messages obsolètes « #~ »\n"
+msgstr ""
+"      --only-obsolete         conserver seulement les messages obsolètes "
+"« #~ »\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulation d'attribut :\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             placer tous les messages dans l'état « fuzzy »\n"
+msgstr ""
+"      --set-fuzzy             placer tous les messages dans l'état "
+"« fuzzy »\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
+msgstr ""
+"      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          marquer tous les messages comme obsolètes\n"
+msgstr ""
+"      --set-obsolete          marquer tous les messages comme obsolètes\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
+msgstr ""
+"      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              avec l'état « fuzzy », conserver les précédentes\n"
+"      --previous              avec l'état « fuzzy », conserver les "
+"précédentes\n"
 "                              chaînes « msgid » des messages traduits.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        retirer la chaîne « previous msgid » de tous les messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        retirer la chaîne « previous msgid » de tous "
+"les messages\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 en enlevant l'état « fuzzy », les chaînes « msgstr » sont remises à zéro\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 en enlevant l'état « fuzzy », les chaînes « "
+"msgstr » sont remises à zéro\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=FICHIER.po  manipuler seulement les entrées listées dans le FICHIER.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FICHIER.po  manipuler seulement les entrées listées dans "
+"le FICHIER.po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=FICHIER.po  manipuler seulement les entrées qui ne sont pas listées dans le FICHIER.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FICHIER.po  manipuler seulement les entrées qui ne sont "
+"pas listées dans le FICHIER.po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 identique à « --only-fuzzy --clear-fuzzy »\n"
+msgstr ""
+"      --fuzzy                 identique à « --only-fuzzy --clear-fuzzy »\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              identique à « --only-obsolete --clear-obsolete »\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              identique à « --only-obsolete --clear-"
+"obsolete »\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntaxe du fichier d'entrée :\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"      --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:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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"
+msgstr ""
+"      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
+"pour --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             ne pas utiliser de séquences d'échappement C dans la sortie (par défaut)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             ne pas utiliser de séquences d'échappement C "
+"dans la sortie (par défaut)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                utiliser des séquences d'échappements C dans la sortie, sans caractère étendu\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                utiliser des séquences d'échappements C dans "
+"la sortie, sans caractère étendu\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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"
+msgstr ""
+"      --force-po              créer un fichier .po même s'il est vide\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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"
+msgstr ""
+"  -i, --indent                créer le fichier .po avec un style indenté\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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"
+msgstr ""
+"      --no-location           ne pas créer les commentaires de numérotation "
+"du type « #: fichier:ligne»\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          créer des commentaires de numérotation du type « #: fichier:ligne » (par défaut)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          créer des commentaires de numérotation du type "
+"« #: fichier:ligne » (par défaut)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                créer des fichier .po strictement conformes à l'Uniforum\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                créer des fichier .po strictement conformes à "
+"l'Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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"
+msgstr ""
+"  -p, --properties-output     créer un fichier « .properties » de type Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    créer un fichier « .strings » de type NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    créer un fichier « .strings » de type NeXTstep/"
+"GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               ne pas couper les lignes de messages qui sont plus longues\n"
+"      --no-wrap               ne pas couper les lignes de messages qui sont "
+"plus longues\n"
 "                              que la largeur des pages de sortie.\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          trier les données de sortie selon "
+"l'emplacement des fichiers\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1356,23 +1600,27 @@ msgstr ""
 "sauf si l'option « --use-first » est utilisée. Dans ce dernier cas,\n"
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=FICHIER    obtenir la liste des fichiers d'entrée à "
+"partir du FICHIER\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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"
+msgstr ""
+"  Si le nom du fichier d'entrée est « - », les données sont lues depuis "
+"l'entrée standard.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1381,7 +1629,7 @@ msgstr ""
 "  -<, --less-than=N           afficher les messages définis moins de N fois\n"
 "                              (sans limite par défaut)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1390,23 +1638,26 @@ 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:414 src/msgcomm.c:405
+#: 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 "  -u, --unique                Afficher les messages uniques (identique à « --less-than=2 »)\n"
+msgstr ""
+"  -u, --unique                Afficher les messages uniques (identique à « --"
+"less-than=2 »)\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1415,46 +1666,50 @@ msgstr ""
 "      --stringtable-input     la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ENCODAGE      encodage de sortie\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             utiliser la première traduction disponible pour chaque\n"
-"                              message ; ne pas faire la fusion de plusieurs traductions\n"
+"      --use-first             utiliser la première traduction disponible "
+"pour chaque\n"
+"                              message ; ne pas faire la fusion de plusieurs "
+"traductions\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NOMCATALOGUE      définir le champ 'Language' dans l'en-tête\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=NOMCATALOGUE      définir le champ 'Language' dans l'en-tête\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "Fichiers d'entrée non spécifiés"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Deux fichiers sont requis en entrée"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage : %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1473,84 +1728,91 @@ 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:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traductions\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     références aux sources\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificateurs d'opération:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          appliquer ref.pot à chaque domaine défini dans def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          appliquer ref.pot à chaque domaine défini dans "
+"def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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"
+msgstr ""
+"  -N, --no-fuzzy-matching     ne pas utiliser la correspondance floue\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             utiliser les traductions approximatives (fuzzy)\n"
+msgstr ""
+"      --use-fuzzy             utiliser les traductions approximatives "
+"(fuzzy)\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      utiliser les messages non traduits\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "ce message n'est pas traduit"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "Ce message est utilisé mais non défini..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais cette définition est semblable"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:316
+#: 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:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1570,74 +1832,88 @@ 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:402
+#: 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 ""
-"  ->, --more-than=N                   afficher les messages avec plus que de N\n"
+"  ->, --more-than=N                   afficher les messages avec plus que de "
+"N\n"
 "                              définitions (1 par défaut)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           ne pas créer d'en-têtes de la forme « msgid \"\" »' \n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           ne pas créer d'en-têtes de la forme « msgid "
+"\"\" »' \n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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"
+msgstr ""
+"msgconv permet de modifier l'encodage utilisé dans un catalogue de "
+"traduction.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cible de conversion :\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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"
+msgstr ""
+"L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indenter les données de sortie\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           supprimer les commentaires du type « #: fichier:ligne »\n"
+msgstr ""
+"      --no-location           supprimer les commentaires du type « #: "
+"fichier:ligne »\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          conserver les commentaires du type « #: fichier:ligne » (par défaut)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          conserver les commentaires du type « #: "
+"fichier:ligne » (par défaut)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                créer une sortie strictement conforme à l'Uniforum\n"
+msgstr ""
+"      --strict                créer une sortie strictement conforme à "
+"l'Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "Un (et un seul) fichier d'entrée doit être fourni"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage : %s [OPTION] FICHIER_ENTRÉE\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1651,22 +1927,22 @@ msgstr ""
 "Le texte original anglais du champ « msgid » est alors utilisé\n"
 "comme traduction pour les messages non traduits.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .po ou .pot\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "Il manque le nom de la commande"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Usage : %s [OPTION] COMMANDE [OPTION_DE_COMMANDE]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1681,7 +1957,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1690,319 +1966,385 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Commande en entrée : \n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   ajouter un nouvelle ligne en fin d’entrée\n"
+msgstr ""
+"  --newline                   ajouter un nouvelle ligne en fin d’entrée\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHIER         fichier .po d'entrée\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "Échec d'écriture sur la sortie standard"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "Il manque le nom du filtre"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "Un script « sed » doit au moins être spécifié"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage : %s [OPTION] FILTRE [OPTION_DU_FILTRE]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"msgfilter permet d'appliquer un filtre à toutes les traductions d'un "
+"catalogue.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, 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 ""
 "Le FILTRE peut être n'importe quel programme qui lit une traduction depuis\n"
-"l'entrée standard et qui renvoie une traduction modifiée sur la sortie standard.\n"
+"l'entrée standard et qui renvoie une traduction modifiée sur la sortie "
+"standard.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Filtrer l’entrée et la sortie :\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
 msgstr ""
-"  --newline                   ajouter un retour à la ligne à la fin de l’entrée\n"
-"                              et supprimer un retour à la ligne à la fin de la sortie"
+"  --newline                   ajouter un retour à la ligne à la fin de "
+"l’entrée\n"
+"                              et supprimer un retour à la ligne à la fin de "
+"la sortie"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, 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"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
-msgstr "  -f, --file=FICHIER_SCRIPT   ajouter le contenu du FICHIER_SCRIPT aux commandes à exécuter\n"
+msgstr ""
+"  -f, --file=FICHIER_SCRIPT   ajouter le contenu du FICHIER_SCRIPT aux "
+"commandes à exécuter\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       demander à « sed »  de ne pas afficher son espace de travail (pattern space)\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       demander à « sed »  de ne pas afficher son "
+"espace de travail (pattern space)\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             ne pas utiliser de séquences d'échappement C dans la sortie (par défaut)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             ne pas utiliser de séquences d'échappement C "
+"dans la sortie (par défaut)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indenter la sortie\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+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:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "le filtre de sortie ne se termine pas par un retour à la ligne"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, 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:421
+#: src/msgfmt.c:419
 #, 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:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
-msgstr "aucun fichier d'entrée ne devrait être passé si les options %s et %s sont spécifiées"
+msgstr ""
+"aucun fichier d'entrée ne devrait être passé si les options %s et %s sont "
+"spécifiées"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s a besoin de l'option « --template template »"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s a besoin de l'option « -o fichier »"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s et %s s'excluent mutuellement dans %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, 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:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "Impossible de localiser les règles ITS pour %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s : "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d message traduit"
 msgstr[1] "%d messages traduits"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduction approximative"
 msgstr[1] ", %d traductions approximatives"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, 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:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage : %s [OPTION] fichier.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, 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"
+msgstr ""
+"msgfmt permet de créer un catalogue binaire de messages à partir de la "
+"description textuelle des traductions.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  mode JAVA : produire une classe Java "
+"« ResourceBundle »\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  mode JAVA : produire une classe Java « ResourceBundle »\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 identique à --java, mais pour Java2 (JDK 1.2 "
+"ou plus récent)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 identique à --java, mais pour Java2 (JDK 1.2 ou plus récent)\n"
+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:937
 #, 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"
+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"
 
 #: src/msgfmt.c:939
 #, 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"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   mode TCL : produire un fichier « .msg » de "
+"type tcl/msgcat\n"
 
 #: src/msgfmt.c:941
 #, 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"
+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:943
 #, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --tcl                   mode QT : produire un fichier « .qm » de type Qt\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Mode de saisie bureau : produire un fichier ."
+"desktop\n"
 
 #: src/msgfmt.c:945
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Mode de saisie bureau : produire un fichier .desktop\n"
-
-#: src/msgfmt.c:947
-#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   mode XML : produire un fichier XML\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                active le mode de conformité stricte à l'Uniforum\n"
+msgstr ""
+"      --strict                active le mode de conformité stricte à "
+"l'Uniforum\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
+msgstr ""
+"  Si le nom du fichier de sortie est « - », la sortie est envoyée vers la "
+"sortie standard\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Java :\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALE         nom de la « locale » (par exemple « fr » ou « fr_FR »)\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE         nom de la « locale » (par exemple « fr » ou "
+"« fr_FR »)\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                produire un fichier .java au lieu d'un fichier .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                produire un fichier .java au lieu d'un "
+"fichier .class\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DOSSIER                  répertoire de base de la hiérarchie des classes\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d DOSSIER                  répertoire de base de la hiérarchie des "
+"classes\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"  Le nom de la classe se détermine en collant le nom de la « locale » au nom de la ressource\n"
-"  et en les séparant par un caractère de soulignement « _ ». L'option -d est obligatoire. La classe est créée\n"
+"  Le nom de la classe se détermine en collant le nom de la « locale » au nom "
+"de la ressource\n"
+"  et en les séparant par un caractère de soulignement « _ ». L'option -d est "
+"obligatoire. La classe est créée\n"
 "  dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Emplacement du fichier de sortie en mode C# :\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d DOSSIER                  répertoire de base pour les fichiers .dll dépendants de la « locale »\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DOSSIER                  répertoire de base pour les fichiers .dll "
+"dépendants de la « locale »\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2012,17 +2354,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:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d DOSSIER                  répertoire de base des catalogues de messages "
+"de type « .msg »\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2031,22 +2375,23 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Options du mode de saisie bureau :\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=TEMPLATE         un fichier .desktop utilisé comme modèle\n"
+msgstr ""
+"  --template=TEMPLATE         un fichier .desktop utilisé comme modèle\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DOSSIER                  répertoire de base des fichier .po\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2055,189 +2400,217 @@ msgstr ""
 "  -kMOT, --keyword=MOT      chercher MOT comme mot clé additionnel\n"
 "  -k, --keyword               ne pas utiliser les mots clés par défaut\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Les options -l, -o et --template sont obligatoires. Si -D est spécifiée,\n"
 "les fichiers d'entrée sont lus depuis le répertoire au lieu des arguments\n"
 "de la ligne de commande.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Options du mode XML :\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NOM          reconnaître le dialect XML spécifié\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         un fichier XML utilisé comme modèle\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 effectuer toutes les vérifications des options\n"
-"                              --check-format, --check-header et --check-domain\n"
+"  -c, --check                 effectuer toutes les vérifications des "
+"options\n"
+"                              --check-format, --check-header et --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, 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"
+msgstr ""
+"      --check-format          vérifier les chaînes de formatage dépendantes "
+"du langage\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          vérifier la présence et le contenu de l'en-tête\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          vérifier la présence et le contenu de l'en-"
+"tête\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          recherche des conflits entre les directives de domaine\n"
+"      --check-domain          recherche des conflits entre les directives de "
+"domaine\n"
 "                              et l'option « --output-file »\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   vérifier que le « msgfmt » de GNU se comporte comme celui de X/Open\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   vérifier que le « msgfmt » de GNU se comporte "
+"comme celui de X/Open\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  vérifier la présence de raccourcis clavier\n"
+"      --check-accelerators[=CHAR]  vérifier la présence de raccourcis "
+"clavier\n"
 "                                   pour les éléments de menu\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, 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"
+msgstr ""
+"  -f, --use-fuzzy             utiliser les traductions approximatives "
+"(fuzzy) dans la sortie\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=N           effectuer un alignement des chaînes à N octets (%d par défaut)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=N           effectuer un alignement des chaînes à N octets "
+"(%d par défaut)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=ORDRE_DES_OCTETS   écrit les octets des entiers 32 bits\n"
-"                                      suivant l'ordre choisi : big, little, default (dépendant du système)\n"
+"                                      suivant l'ordre choisi : big, little, "
+"default (dépendant du système)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               ne pas inclure la table de hachage dans le fichier binaire\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               ne pas inclure la table de hachage dans le "
+"fichier binaire\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            afficher les statistiques de traduction\n"
+msgstr ""
+"      --statistics            afficher les statistiques de traduction\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               afficher plus d'informations\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, 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:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
 
-#: src/msgfmt.c:1202
-#, 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:1204
-#, 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:1228
+#: src/msgfmt.c:1211
 #, 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:1233
+#: src/msgfmt.c:1216
 #, 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é"
+msgstr ""
+"Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe "
+"sera utilisé"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directive « domain %s » ignorée"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "Une chaîne vide « msgstr » a été ignorée"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s : AVERTISSEMENT : le fichier source contient des traductions approximatives"
+msgstr ""
+"%s : AVERTISSEMENT : le fichier source contient des traductions "
+"approximatives"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe mais ne peut être lu"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, 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é"
+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é"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2246,7 +2619,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2321,32 +2694,44 @@ 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:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                utiliser les séquences d'échappements C dans la sortie, sans caractère étendu\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                utiliser les séquences d'échappements C dans "
+"la sortie, sans caractère étendu\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           trier les données en sortie\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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:298
+msgstr ""
+"      --sort-by-file          trier la sortie selon l'emplacement des "
+"fichiers\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Votre environnement est insensible au langage.  Veuillez\n"
 "définir votre variable d'environnement LANG comme décrit dans\n"
-"le fichier ABOUT-NLS. Ceci est nécessaire pour pouvoir tester vos traductions.\n"
+"le fichier ABOUT-NLS. Ceci est nécessaire pour pouvoir tester vos "
+"traductions.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2357,12 +2742,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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s a été créé.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2371,75 +2756,90 @@ 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:378
+#: src/msginit.c:381
 #, 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:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
-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"
+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:386
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=FICHIER   écrire les données en sortie dans le FICHIER "
+"spécifié\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"  Si aucun fichier de sortie n'est spécifié, les données en sortie dépendent de\n"
-"  l'option « --locale » ou de la « locale » de l'utilisateur. Si le nom de fichier de sortie\n"
+"  Si aucun fichier de sortie n'est spécifié, les données en sortie dépendent "
+"de\n"
+"  l'option « --locale » ou de la « locale » de l'utilisateur. Si le nom de "
+"fichier de sortie\n"
 "  est « - », les données sont envoyées vers la sortie standard.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          définir la langue cible\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         supposer que le fichier .po est produit de manière automatique\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         supposer que le fichier .po est produit de "
+"manière automatique\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Plusieurs fichiers .pot ont été trouvés.\n"
-"Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --input ».\n"
+"Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
+"input ».\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "Erreur de lecture du dossier actuel"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Aucun fichier .pot dans le dossier actuel.\n"
-"Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --input ».\n"
+"Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
+"input ».\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, 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:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Le nouveau catalogue de messages devrait contenir votre adresse de courriel\n"
@@ -2450,64 +2850,78 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traductions françaises du paquet %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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 »"
+msgstr ""
+"Le fichier d'entrée contient deux jeux de caractères différents « %s » et "
+"« %s »"
 
-#: src/msgl-cat.c:204
+#: 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 »"
+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 »"
 
-#: src/msgl-cat.c:208
+#: 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 "Aucun jeu de caractères n'est spécifié pour le domaine « %s » dans l'en-tête du fichier d'entrée « %s »"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+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:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Les fichiers d'entrée contiennent des messages dans plusieurs encodages, dont l'UTF-8.\n"
+"Les fichiers d'entrée contiennent des messages dans plusieurs encodages, "
+"dont l'UTF-8.\n"
 "L'ensemble a été converti en UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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 dans plusieurs encodages, dont %s et %s.\n"
+"Les fichiers d'entrée contiennent des messages dans plusieurs encodages, "
+"dont %s et %s.\n"
 "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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2517,10 +2931,11 @@ msgid ""
 msgstr ""
 "La conversion du fichier%s depuis l'encodage %s vers l'encodage %s\n"
 "modifie certaines chaînes msgid ou msgctxt.\n"
-"Vous pouvez soit changer tous les msgid et les msgctxt vers du pur ASCII ou vous assurer qu'ils sont\n"
+"Vous pouvez soit changer tous les msgid et les msgctxt vers du pur ASCII ou "
+"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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2533,12 +2948,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:99
 #, 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"
+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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2549,7 +2966,7 @@ msgstr ""
 "  puis appliquer « %s »,\n"
 "  et reconvertir en %s en utilisant « msgconv ».\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2557,19 +2974,21 @@ msgid ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- assigner à la variable d'environnement LC_ALL un nom de langue ayant l'encodage %s,\n"
+"- assigner à la variable d'environnement LC_ALL un nom de langue ayant "
+"l'encodage %s,\n"
 "  convertir le catalogue de traduction en %s en utilisant « msgconv »,\n"
 "  puis appliquer « %s »,\n"
 "  et reconvertir en %s en utilisant « msgconv ».\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Le jeu de caractères « %s » de la langue n'est pas un nom d'encodage portable.\n"
+"Le jeu de caractères « %s » de la langue n'est pas un nom d'encodage "
+"portable.\n"
 "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"
 
@@ -2580,7 +2999,9 @@ msgstr "L'expression au pluriel peut produire des valeurs négatives."
 #: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi "
+"grande que %lu"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
@@ -2591,8 +3012,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "L'expression au pluriel peut induire un débordement d'entier"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "L'expression au pluriel peut produire une erreur arithmétique, probablement une division par zéro"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"L'expression au pluriel peut produire une erreur arithmétique, probablement "
+"une division par zéro"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2601,7 +3026,8 @@ msgstr "Essayez d'utiliser ce qui suit, valable pour %s :"
 
 #: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
-msgstr "Le catalogue de messages contient des traductions d'expressions au pluriel"
+msgstr ""
+"Le catalogue de messages contient des traductions d'expressions au pluriel"
 
 #: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
@@ -2639,38 +3065,57 @@ msgstr[0] "mais certains messages ont une forme de pluriel"
 msgstr[1] "mais certains messages ont %lu formes de pluriel"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "Le catalogue de messages contient des traductions de formes au pluriel, mais il manque une entrée « Plural-Forms: nplurals=INTEGER; plural=EXPRESSION; » dans l'en-tête"
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"Le catalogue de messages contient des traductions de formes au pluriel, mais "
+"il manque une entrée « Plural-Forms: nplurals=INTEGER; plural=EXPRESSION; » "
+"dans l'en-tête"
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgid_plural » ne débutent pas toutes les deux "
+"par « \\n »"
 
 #: src/msgl-check.c:623
 #, 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgstr[%u] » ne débutent pas toutes les deux par "
+"« \\n »"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgstr » ne débutent pas toutes les deux par "
+"« \\n »"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgid_plural » ne se terminent pas toutes les "
+"deux par « \\n »"
 
 #: src/msgl-check.c:664
 #, 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgstr[%u] » ne se terminent pas toutes les deux "
+"par « \\n »"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 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 »"
+msgstr ""
+"Les chaînes « msgid » et « msgstr » ne se terminent pas toutes les deux par "
+"« \\n »"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
-msgstr "La gestion des formes du pluriel est une extension de la version GNU de gettext"
+msgstr ""
+"La gestion des formes du pluriel est une extension de la version GNU de "
+"gettext"
 
 #: src/msgl-check.c:733
 #, c-format
@@ -2700,15 +3145,15 @@ msgstr "Ellipse ASCII (\"...\") plutôt qu’Unicode"
 msgid "space before ellipsis found in user visible strings"
 msgstr "espace avant l’ellipse trouvée dans une chaîne utilisateur visible"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "utiliser une apostrophe ASCII double plutôt qu’Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "utiliser une apostrophe ASCII simple plutôt qu’Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "Tiret ASCII (\"%c\") plutôt qu’Unicode"
@@ -2721,39 +3166,54 @@ msgstr "%s : l'entrée n'est pas valide dans l'encodage %s"
 #: 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 »"
+msgstr ""
+"%s : erreur pendant la conversion depuis l'encodage « %s » vers l'encodage « "
+"%s »"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 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"
+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:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv() et celui-ci ne permet pas cette conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+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:335
+#: src/msgl-iconv.c:330
 #, 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."
+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."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv(), et cette version a été compilée sans iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s est valable seulement avec %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "Type de sauvegarde"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2779,189 +3239,233 @@ 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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      traduction des anciens messages sources\n"
+msgstr ""
+"  def.po                      traduction des anciens messages sources\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     messages sources actuels à traduire\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FICHIER    fichier de bibliothèque additionnelle de traduction,\n"
+"  -C, --compendium=FICHIER    fichier de bibliothèque additionnelle de "
+"traduction,\n"
 "                              peut être spécifié plusieurs fois\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                mettre à jour le fichier def.po,\n"
-"                              ne rien faire si le fichier def.po est déjà à jour\n"
+"                              ne rien faire si le fichier def.po est déjà à "
+"jour\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Emplacement du fichier de sortie en mode mise à jour :\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
+msgstr ""
+"      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"  La méthode de contrôle de version peut être sélectionnée avec l'option « --backup » ou\n"
+"  La méthode de contrôle de version peut être sélectionnée avec l'option « --"
+"backup » ou\n"
 "  avec la variable d'environnement VERSION_CONTROL.\n"
 "  En voici les valeurs possibles :\n"
-"  none, off                   ne jamais créer de sauvegarde (même si « --backup » est spécifié)\n"
+"  none, off                   ne jamais créer de sauvegarde (même si « --"
+"backup » est spécifié)\n"
 "  numbered, t                 créer des sauvegardes numérotées\n"
-"  existing, nil               numéroter s'il existe des sauvegardes numérotées,\n"
+"  existing, nil               numéroter s'il existe des sauvegardes "
+"numérotées,\n"
 "                              sinon effectuer des sauvegardes simples\n"
 "  simple, never               toujours créer des sauvegardes simples\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+"      --boost                 reconnaître les chaînes au format Boost\n"
+
+#: src/msgmerge.c:615
 #, 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"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              conserver les précédentes chaînes « msgid » "
+"des messages traduits\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       supprimer le témoin de progression\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "Ce message devrait définir des formes au pluriel"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, 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:2053
+#: src/msgmerge.c:2110
 #, 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"
+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"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " terminé.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"msgunfmt permet de convertir un catalogue binaire de traductions en fichier ."
+"po de type Uniforum\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java               mode Java : l'entrée est une classe Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java               mode Java : l'entrée est une classe Java "
+"ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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"
+msgstr ""
+"      --csharp                mode C# : l'entrée est un fichier « .dll » de "
+"type .NET\n"
 
-#: src/msgunfmt.c:445
+#: 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"
+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"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                mode Tcl :  l'entrée est un fichier « .msg » de type tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                mode Tcl :  l'entrée est un fichier « .msg » de "
+"type tcl/msgcat\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .mo\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"  Le nom de la classe est déterminé en ajoutant le nom de la locale au nom de la ressource, et\n"
+"  Le nom de la classe est déterminé en ajoutant le nom de la locale au nom "
+"de la ressource, et\n"
 "  en les séparant par un caractère de soulignement « _ ».\n"
-"  L'emplacement de la classe est déterminé par la variable d'environnement CLASSPATH.\n"
+"  L'emplacement de la classe est déterminé par la variable d'environnement "
+"CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: 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 options « -l » et « -d » sont obligatoires.\n"
-"  Le fichier « .dll » est situé dans le sous-répertoire (du répertoire spécifié)\n"
+"  Le fichier « .dll » est situé dans le sous-répertoire (du répertoire "
+"spécifié)\n"
 "  dont le nom dépend de la langue.\n"
 
-#: src/msgunfmt.c:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2970,17 +3474,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:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                indenter la sortie\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                produire une sortie strictement conforme à l'Uniforum\n"
+msgstr ""
+"      --strict                produire une sortie strictement conforme à "
+"l'Uniforum\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3001,19 +3507,21 @@ 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:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              afficher seulement les doublons\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "  -u, --unique                afficher seulement les messages uniques,\n"
 "                              en ignorant les doublons\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3025,7 +3533,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Le jeu de caractères « %s » n'est pas un nom d'encodage portable.\n"
-"La conversion vers le jeu de caractères de l'utilisateur peut ne pas fonctionner.\n"
+"La conversion vers le jeu de caractères de l'utilisateur peut ne pas "
+"fonctionner.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -3046,7 +3555,9 @@ msgstr ""
 
 #: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
-msgstr "On continue quand même... attendez-vous à des erreurs d'interprétation du fichier."
+msgstr ""
+"On continue quand même... attendez-vous à des erreurs d'interprétation du "
+"fichier."
 
 #: src/po-charset.c:580
 msgid "Continuing anyway."
@@ -3067,34 +3578,35 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Il manque le jeu de caractères dans l'en-tête.\n"
-"La conversion vers le jeu de caractères de l'utilisateur ne fonctionnera pas.\n"
+"La conversion vers le jeu de caractères de l'utilisateur ne fonctionnera "
+"pas.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "Utilisation incohérente de #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "Section « msgstr[] » absente"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "Section « msgstr_plural » absente"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "Section « msgstr » absente"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "La première forme du pluriel a un indice non nul"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "La forme du pluriel a un indice erroné"
@@ -3104,7 +3616,7 @@ msgstr "La forme du pluriel a un indice erroné"
 msgid "too many errors, aborting"
 msgstr "Trop d'erreurs, on abandonne"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Séquence d'octets multiples invalide"
@@ -3114,41 +3626,41 @@ msgstr "Séquence d'octets multiples invalide"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Séquence d'octets multiples incomplète à la fin du fichier"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, 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:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "Échec de « iconv() »"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Mot clé inconnu : « %s »"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "Séquence de contrôle invalide"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "Fin de fichier au milieu d'une chaîne"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "Fin de ligne au milieu d'une chaîne"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, 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:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
@@ -3178,7 +3690,7 @@ msgstr "« = » manquant après « %s »"
 msgid "invalid non-blank line"
 msgstr "ligne non vide invalide"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "Le fichier « %s » est tronqué"
@@ -3188,29 +3700,46 @@ msgstr "Le fichier « %s » est tronqué"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Le fichier « %s » contient une chaîne non terminée par un octet nul"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "Le fichier « %s » contient une chaîne non terminée par un octet nul"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Le fichier « %s » n'est pas au format GNU « .mo »"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "Le fichier « %s » contient une chaîne non terminée par un octet nul, à %s"
+msgstr ""
+"Le fichier « %s » contient une chaîne non terminée par un octet nul, à %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "AVERTISSEMENT : syntaxe \\uxxxx incorrecte pour un caractère Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d : AVERTISSEMENT : substitut isolé U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "AVERTISSEMENT : caractère Unicode invalide"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "AVERTISSEMENT : chaîne non terminée"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "AVERTISSEMENT : erreur de syntaxe"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "AVERTISSEMENT : paire clé/valeur non terminée"
 
@@ -3218,11 +3747,12 @@ msgstr "AVERTISSEMENT : paire clé/valeur non terminée"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "AVERTISSEMENT : erreur de syntaxe : il manque « ; » après la chaîne"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "AVERTISSEMENT : erreur de syntaxe : il manque « = » ou « ; » après la chaîne"
+msgstr ""
+"AVERTISSEMENT : erreur de syntaxe : il manque « = » ou « ; » après la chaîne"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Écrit par %s et %s.\n"
@@ -3231,16 +3761,16 @@ msgstr "Écrit par %s et %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Réencode du texte serbe du Cyrillique vers le Latin.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3249,27 +3779,28 @@ msgstr ""
 "Le texte est lu depuis l'entrée standard.  Le texte converti est envoyé\n"
 " vers la sortie standard.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l'entrée n'est pas valide en encodage %s"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "Erreur lors de la conversion depuis l'encodage « %s » vers l'encodage « %s »"
+msgstr ""
+"Erreur lors de la conversion depuis l'encodage « %s » vers l'encodage « %s »"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "Deux arguments étaient attendus"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Usage : %s [OPTION] URL FICHIER\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3278,113 +3809,138 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "Erreur de lecture de « %s »"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "Erreur d'écriture sur la sortie standard"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "Erreur après la lecture de « %s »"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Récupération de %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " délai expiré.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " échoué.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Impossible d'écrire plusieurs domaines de traduction dans un fichier unique avec le format de sortie spécifié. Essayez plutôt d'utiliser une syntaxe de type .po"
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Impossible d'écrire plusieurs domaines de traduction dans un fichier unique "
+"avec le format de sortie spécifié. Essayez plutôt d'utiliser une syntaxe de "
+"type .po"
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Impossible d'écrire plusieurs domaines de traduction dans un fichier unique avec le format de sortie spécifié."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Impossible d'écrire plusieurs domaines de traduction dans un fichier unique "
+"avec le format de sortie spécifié."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "Le catalogue de messages contient des traductions dépendantes du contexte mais le format de sortie ne les supporte pas."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"Le catalogue de messages contient des traductions dépendantes du contexte "
+"mais le format de sortie ne les supporte pas."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "Le catalogue de messages contient des traductions avec des formes au pluriel mais le format de sortie ne les supporte pas. Essayez plutôt de produire une classe Java en utilisant « msgfmt --java »."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"Le catalogue de messages contient des traductions avec des formes au pluriel "
+"mais le format de sortie ne les supporte pas. Essayez plutôt de produire une "
+"classe Java en utilisant « msgfmt --java »."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 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:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Impossible de créer le fichier « %s »"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "sortie standard"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Échec lors de la création du dossier « %s »"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, 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:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "Échec de compilation de la classe C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "Erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, 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:1210
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"Échec de compilation de la classe Java. Essayez l'option « --verbose » ou "
+"définissez $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, 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"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "Séquence d'octets multiples incomplète"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, 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 »"
+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:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3397,7 +3953,7 @@ msgstr ""
 "différent du vôtre. Vous devriez utiliser un msgctxt en pur ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3406,8 +3962,10 @@ msgid ""
 "%s\n"
 msgstr ""
 "La chaîne « msgid » qui suit contient des caractères non ASCII.\n"
-"Cela causera un problème aux traducteurs qui utilisent un encodage de caractères\n"
-"différent du vôtre. Vous devriez plutôt créer des chaînes « msgid » en pur ASCII.\n"
+"Cela causera un problème aux traducteurs qui utilisent un encodage de "
+"caractères\n"
+"différent du vôtre. Vous devriez plutôt créer des chaînes « msgid » en pur "
+"ASCII.\n"
 "« %s »\n"
 
 #: src/write-qt.c:668
@@ -3420,12 +3978,15 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"Certaines chaînes msgctxt du catalogue de messages contiennent des caractères hors de l'ISO-8859-1\n"
-"mais le format de catalogue des messages de type Qt ne supporte l'Unicode que dans les chaînes traduites\n"
+"Certaines chaînes msgctxt du catalogue de messages contiennent des "
+"caractères hors de l'ISO-8859-1\n"
+"mais le format de catalogue des messages de type Qt ne supporte l'Unicode "
+"que dans les chaînes traduites\n"
 "et pas dans les chaînes de contexte\n"
 
 #: src/write-qt.c:718
@@ -3434,16 +3995,18 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"Certaines chaînes « msgid » du catalogue de messages contiennent des caractères\n"
-"hors de l'ISO-8859-1 mais le format de catalogue de type Qt ne supporte l'Unicode\n"
+"Certaines chaînes « msgid » du catalogue de messages contiennent des "
+"caractères\n"
+"hors de l'ISO-8859-1 mais le format de catalogue de type Qt ne supporte "
+"l'Unicode\n"
 "que dans les chaînes traduites, pas dans les chaînes sources\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "Erreur pendant l'écriture sur le sous-processus %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3451,7 +4014,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:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3459,7 +4022,7 @@ msgstr ""
 "le catalogue de messages contient des formes de traduction au pluriel\n"
 "mais le format .resources de type C# ne les supporte pas.\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3467,44 +4030,66 @@ msgstr ""
 "Le catalogue de messages contient des traductions dépendantes du contexte\n"
 "mais le format de catalogue de type Tcl ne les supporte pas\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 "Le catalogue de messages contient des formes de traduction au pluriel\n"
-"mais le format de catalogue de type Tcl ne supporte pas les formes au pluriel\n"
+"mais le format de catalogue de type Tcl ne supporte pas les formes au "
+"pluriel\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d : AVERTISSEMENT : expression rationnelle non terminée"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "AVERTISSEMENT : caractère Unicode invalide"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d : AVERTISSEMENT : constante caractère sans terminaison"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
-msgstr "Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
+msgstr ""
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3513,7 +4098,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:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3522,7 +4107,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:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3531,7 +4116,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:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3540,12 +4125,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:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3554,119 +4139,150 @@ 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:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, 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:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « ) » trouvé à la place de « } »"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « } » trouvé à la place de « ) »"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "« %s » n'est pas un nom d'encodage valide. ASCII a été utilisé à la place.\n"
+msgstr ""
+"« %s » n'est pas un nom d'encodage valide. ASCII a été utilisé à la place.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "vérification de syntaxe « %s » inconnue"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "sentence de fin de type « %s » inconnue"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, 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"
+msgstr ""
+"L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur "
+"la sortie standard"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "AVERTISSEMENT : le fichier de règle ITS « %s » n’existe pas"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "AVERTISSEMENT : le fichier de règle ITS « %s » n’existe pas ; vérifiez votre installation de gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"AVERTISSEMENT : le fichier de règle ITS « %s » n’existe pas ; vérifiez votre "
+"installation de gettext"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, 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"
+msgstr ""
+"AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On "
+"suppose que c'est du C"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, 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"
+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:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de "
+"messages.po)\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, 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"
+msgstr ""
+"  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=RÉP        créer les fichiers de sortie dans le répertoire spécifié\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=RÉP        créer les fichiers de sortie dans le "
+"répertoire spécifié\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NOM          reconnaître le langage spécifié\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3675,35 +4291,42 @@ msgstr ""
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, 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:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing            joindre les messages au fichier existant\n"
+msgstr ""
+"  -j, --join-existing            joindre les messages au fichier existant\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas "
+"extraites\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   ajouter les blocs de commentaires débutant avec TAG et\n"
-"                                précédant les lignes de mot clé dans le fichier de sortie\n"
-"  -c, --add-comments          ajouter tous les blocs de commentaires précédant les lignes de mots clés\n"
+"  -cTAG, --add-comments=TAG   ajouter les blocs de commentaires débutant "
+"avec TAG et\n"
+"                                précédant les lignes de mot clé dans le "
+"fichier de sortie\n"
+"  -c, --add-comments          ajouter tous les blocs de commentaires "
+"précédant les lignes de mots clés\n"
 "                                dans le fichier de sortie\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3714,7 +4337,7 @@ msgstr ""
 "                                (ellipsis-unicode, ellipsis-espace,\n"
 "                                 apostrophe-unicode, tiret-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3725,245 +4348,211 @@ msgstr ""
 "                                (espace-simple, par défaut, \n"
 "                                 ou espace-double)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                              (seulement les langages C, C++, ObjectiveC, "
+"Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                              Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                              (seulement les langages C, C++, ObjectiveC, "
+"Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                              Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=MOT:ARG:DRAPEAU  DRAPEAU additionnel pour des chaînes à l'intérieur de\n"
+"      --flag=MOT:ARG:DRAPEAU  DRAPEAU additionnel pour des chaînes à "
+"l'intérieur de\n"
 "                              l'argument numéro ARG du MOT clé\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                              (seulement les langages C, C++, ObjectiveC, "
+"Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                              C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                              Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, 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"
+msgstr ""
+"  -T, --trigraphs             comprendre les trigrammes ANSI C pour "
+"l'entrée\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                              (seuls les langages C, C++, ObjectiveC)\n"
+msgstr ""
+"                              (seuls les langages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=FILE              appliquer les règles ITS du FICHIER\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
-msgstr "                              (seulement les langages de la famille XML)\n"
+msgstr ""
+"                              (seulement les langages de la famille XML)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   reconnaître les chaînes au format KDE 4\n"
+msgstr ""
+"      --kde                   reconnaître les chaînes au format KDE 4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 reconnaître les chaînes au format Boost\n"
+msgstr ""
+"      --boost                 reconnaître les chaînes au format Boost\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 mieux détailler la reconnaissance des chaînes de format\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 mieux détailler la reconnaissance des chaînes "
+"de format\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     produire un fichier « .properties » de type Java\n"
+msgstr ""
+"      --properties-output     produire un fichier « .properties » de type "
+"Java\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
-msgstr "      --itstool               envoyer sur la sortie les commentaires d’itstool\n"
+msgstr ""
+"      --itstool               envoyer sur la sortie les commentaires "
+"d’itstool\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, 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:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          omettre le copyright FSF dans la sortie pour les utilisateurs étrangers\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          omettre le copyright FSF dans la sortie pour "
+"les utilisateurs étrangers\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, 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:1207
+#: src/xgettext.c:1194
 #, 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"
+msgstr ""
+"      --package-version=VERSION  donne la version du paquet dans la sortie\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les rapport d'anomalie des msgid\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les "
+"rapport d'anomalie des msgid\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[CHAINE], --msgstr-prefix[=CHAINE]  utiliser la CHAINE ou \"\" comme préfixe aux valeurs\n"
+"  -m[CHAINE], --msgstr-prefix[=CHAINE]  utiliser la CHAINE ou \"\" comme "
+"préfixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[CHAINE], --msgstr-suffix[=CHAINE]  utiliser la CHAINE ou \"\" comme suffixe aux valeurs\n"
+"  -M[CHAINE], --msgstr-suffix[=CHAINE]  utiliser la CHAINE ou \"\" comme "
+"suffixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:2040
-#, c-format
-msgid "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:2165
-msgid "standard input"
-msgstr "entrée standard"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Caractère non-ASCII à %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Commentaire non-ASCII à (ou avant) %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Chaîne non-ASCII à %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s : AVERTISSEMENT : "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison est :%s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "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:2480
+#: src/xgettext.c:1597
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"La chaîne de format '%s' avec des arguments non nommés ne peut pas être correctement localisée :\n"
-"Le traducteur ne peut pas réordonner les arguments.\n"
-"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:2545
-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 ""
-"Chaîne « msgid » vide.  Cet usage est réservé par\n"
-"GNU gettext : gettext(\"\") retourne l'en-tête\n"
-"avec les informations de contexte, pas une chaîne vide.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "Argument ambigu pour le mot clé « %.*s »"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
-
-#: src/xgettext.c:3334
-#, 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 »"
+"Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:"
+"[pass-]<drapeau>:%s"
 
-#: src/xgettext.c:3355
-#, 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:1695
+msgid "standard input"
+msgstr "entrée standard"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3975,21 +4564,17 @@ 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:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "langage « %s » inconnu"
 
-#: 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-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
-msgstr "Veuillez spécifier l'encodage de la source avec l'option « --from-code »\n"
+msgstr ""
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code »\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3998,7 +4583,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-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4007,7 +4592,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-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4016,7 +4601,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-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4025,7 +4610,7 @@ 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-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4034,145 +4619,208 @@ 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-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d : AVERTISSEMENT : RegExp terminé trop tôt"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d : AVERTISSEMENT : %s n'est pas autorisé"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d : AVERTISSEMENT : balisage XML non terminé"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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"
+msgstr ""
+"%s:%d : impossible de trouver la terminaison de chaîne « %s » avant la fin "
+"du fichier"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d : interpolation invalide de variable à « %c »"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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 »"
-
-#: src/x-python.c:278
+msgstr ""
+"%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
+
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d : séquence d'octets multiples invalide.\n"
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 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 » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 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 » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 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 » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page : http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d : séquence d'octets multiples invalide.\n"
-"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou avec un commentaire\n"
+"Veuillez spécifier l'encodage de la source avec l'option « --from-code » ou "
+"avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d : définition de chaîne invalide"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d : nombre manquant après « # »"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d : expression chaîne invalide"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d : définition de chaîne invalide"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d : définition de chaîne invalide"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée "
+"pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d : AVERTISSEMENT : expression régulière terminée trop tôt"
@@ -4303,5 +4951,110 @@ msgstr "dans un commentaire ou une instruction de traitement"
 msgid "document ended unexpectedly: %s"
 msgstr "le document se termine de manière inattendue par : %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s : l'option « --%s » n'est pas connue\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s : l'option « -W %s » est ambiguë\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s : l'option « -W %s » requiert un argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "AVERTISSEMENT : l'en-tête du fichier .po est approximatif (fuzzy)\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Caractère non-ASCII à %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Commentaire non-ASCII à (ou avant) %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Chaîne non-ASCII à %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s : AVERTISSEMENT : "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Malgré sa position, %s n'est pas une chaîne de format %s valide. La "
+#~ "raison est :%s\n"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "La chaîne de format '%s' avec des arguments non nommés ne peut pas être "
+#~ "correctement localisée :\n"
+#~ "Le traducteur ne peut pas réordonner les arguments.\n"
+#~ "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"
+
+#~ 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 ""
+#~ "Chaîne « msgid » vide.  Cet usage est réservé par\n"
+#~ "GNU gettext : gettext(\"\") retourne l'en-tête\n"
+#~ "avec les informations de contexte, pas une chaîne vide.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "Argument ambigu pour le mot clé « %.*s »"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
+
+#, 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 »"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr ""
+#~ "incohérence de contexte entre la forme du singulier et celle du pluriel"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
-#~ msgstr "L'élément racine <%s> n'est pas autorisé dans un fichier CLDR valide"
+#~ msgstr ""
+#~ "L'élément racine <%s> n'est pas autorisé dans un fichier CLDR valide"
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 2c5e220ad..bdf002aec 100644
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2014-05-20 13:35+0200\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -21,38 +21,40 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argumento incorrecto %s para %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argumento %s ambiguo para %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Os argumentos válidos son:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "non foi posíbel atopar ningún directorio temporal, probe a definir $TMPDIR"
+msgstr ""
+"non foi posíbel atopar ningún directorio temporal, probe a definir $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "non é posíbel crear un directorio temporal empregando o patrón «%s»"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "non é posíbel retirar o ficheiro temporal %s"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "non é posíbel retirar o directorio temporal %s"
@@ -61,195 +63,186 @@ msgstr "non é posíbel retirar o directorio temporal %s"
 msgid "write error"
 msgstr "erro de escritura"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "conservando os permisos de %s"
 
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "produciuse un erro ao abrir «%s» para lectura"
 
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
-msgstr "non é posíbel abrir o ficheiro de copia de seguridade «%s» para escribir"
+msgstr ""
+"non é posíbel abrir o ficheiro de copia de seguridade «%s» para escribir"
 
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "produciuse un erro ao ler «%s»"
 
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "produciuse un erro ao escribir «%s»"
 
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "produciuse un erro despois de ler «%s»"
 
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() fallou"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Non se atopou ningún compilador de C#, probe a instalar pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Non se atopou a máquina virtual de C#, probe a instalar pnet"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, fuzzy, c-format
 msgid "%s subprocess failed"
 msgstr "fallou o subproceso %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a opción «-W %s» é ambigua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, 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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opción «%c%s» non recoñecida\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: a opción «%c%s» non permite un argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: a opción «--%s» require un argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opción «--%s» non recoñecida\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opción «%c%s» non recoñecida\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción incorrecta -- «%c»\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a opción require un argumento -- «%c»\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opción «-W %s» é ambigua\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a opción «-W %s» non permite un argumento\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opción «-W %s» require un argumento\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "produciuse un erro ao crear «%s»"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "produciuse un erro ao escribir o ficheiro «%s»"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Non se atopou o compilador de Java, probe a instalar gcj ou definir $JAVAC"
+msgstr ""
+"Non se atopou o compilador de Java, probe a instalar gcj ou definir $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Non se atopou a máquina virtual de Java, probe a instalar gij ou definir $JAVA"
+msgstr ""
+"Non se atopou a máquina virtual de Java, probe a instalar gij ou definir "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Erro de E/S do subproceso %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "produciuse un erro ao crear os fíos"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "produciuse un erro ao escribir ao subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "produciuse un erro ao ler do subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -273,13 +266,13 @@ msgstr ""
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "»"
 
@@ -288,56 +281,198 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "definindo os permisos de %s"
 
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "non é posíbel crear a canalización"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fallou"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "non foi posíbel restaurar o fd %d: dup2 fallou"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "subproceso %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: 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:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "produciuse un erro ao abrir «%s» para lectura"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:151
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Use «%s --help» para obter máis información.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] URL FILE\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Uso: %s [OPCIÓN] URL FICHEIRO\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               Mostra a información da versión e sae\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrito por %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "non é posíbel retirar o directorio temporal %s"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
 msgstr ""
 
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "produciuse un erro ao abrir «%s» para lectura"
+
 #: 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-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "unha especificación de formato para o argumento %u, como en «%s», non existe en «%s»"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"unha especificación de formato para o argumento %u, como en «%s», non existe "
+"en «%s»"
 
 #: 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-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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'"
@@ -345,22 +480,31 @@ msgstr "unha especificación de formato para o argumento %u non existe en «%s»
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
 #: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "as especificacións de formato en «%s» e «%s» para o argumento %u non son as mesmas"
+msgstr ""
+"as especificacións de formato en «%s» e «%s» para o argumento %u non son as "
+"mesmas"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+
 #: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
 #: src/format-c.c:39
@@ -373,42 +517,45 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "o número de especificacións de formato en «%s» e «%s» non coincide"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr ""
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
@@ -425,12 +572,16 @@ msgstr ""
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr ""
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr ""
 
 #: src/format-gcc-internal.c:406
@@ -468,32 +619,43 @@ msgid "The string ends in the middle of a directive."
 msgstr ""
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr ""
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr ""
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr ""
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr ""
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr ""
 
 #: src/format-invalid.h:40
@@ -503,7 +665,9 @@ msgstr ""
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr ""
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
@@ -513,12 +677,15 @@ msgstr ""
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
 #: src/format-java.c:572
@@ -528,156 +695,213 @@ msgstr ""
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
 msgstr ""
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "unha especificación de formato para o argumento {%u}, como en «%s», non existe en «%s»"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"unha especificación de formato para o argumento {%u}, como en «%s», non "
+"existe en «%s»"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "unha especificación de formato para o argumento {%u} non existe en «%s»"
+msgstr ""
+"unha especificación de formato para o argumento {%u} non existe en «%s»"
 
 #: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "as especificacións de formato en «%s» e «%s» para o argumento {%u} non son as mesmas"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"as especificacións de formato en «%s» e «%s» para o argumento {%u} non son "
+"as mesmas"
+
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"unha especificación de formato para o argumento %u, como en «%s», non existe "
+"en «%s»"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "produciuse un erro ao ler «%s»"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
+msgid ""
+"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."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "as especificacións de formato en «%s» e «%s» non son equivalentes"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "as especificacións de formato en «%s» non son un subconxunto das de «%s»"
-
-#: src/format-perl.c:433
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
 msgstr ""
+"as especificacións de formato en «%s» non son un subconxunto das de «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "unha especificación de formato para o argumento «%s» non existe en «%s»"
+msgstr ""
+"unha especificación de formato para o argumento «%s» non existe en «%s»"
 
-#: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
 msgstr ""
 
-#: src/format-python.c:354
+#: src/format-python-brace.c:138
 #, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
+msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python.c:430
+#: src/format-python-brace.c:157
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python.c:437
+#: src/format-python-brace.c:171
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python-brace.c:193
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "unha especificación de formato para o argumento «%s», como en «%s», non existe en «%s»"
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
 
-#: src/format-python.c:494
+#: src/format-python-brace.c:278
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "as especificacións de formato en «%s» e «%s» para o argumento «%s» non son as mesmas"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
 
-#: src/format-python-brace.c:137
+#: 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:354
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
+msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python-brace.c:150
+#: src/format-python.c:430
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python-brace.c:165
+#: src/format-python.c:437
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python-brace.c:185
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
+"unha especificación de formato para o argumento «%s», como en «%s», non "
+"existe en «%s»"
 
-#: src/format-python-brace.c:270
+#: src/format-python.c:494
 #, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
+"as especificacións de formato en «%s» e «%s» para o argumento «%s» non son "
+"as mesmas"
 
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
+msgid ""
+"'%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
@@ -685,11 +909,15 @@ msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
 msgstr ""
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr ""
 
 #: src/format-sh.c:85
@@ -698,145 +926,151 @@ msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr ""
-
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
-#, 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:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
-#: src/urlget.c:149
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Use «%s --help» para obter máis información.\n"
-
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uso: %s [OPCIÓN]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato de saída:\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               Mostra a información da versión e sae\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "téñense que indicar polo menos dous ficheiros"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "non é posíbel crear a canalización"
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "argumento incorrecto %s para %s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "non é posíbel crear a canalización"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "non é posíbel crear o ficheiro de saída «%s»"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
 #: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "permítese un ficheiro de entrada como moito"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
@@ -853,18 +1087,19 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
 #: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
@@ -874,37 +1109,39 @@ msgstr ""
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
 #: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
 #: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
@@ -912,19 +1149,21 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaxes:\n"
 
 #: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
 #: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
 #: src/msgattrib.c:456
@@ -981,22 +1220,27 @@ msgstr ""
 
 #: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr ""
 
 #: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
 
 #: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
 #: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
 #: src/msgattrib.c:486
@@ -1006,154 +1250,164 @@ msgstr ""
 
 #: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
 #: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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 é imposíbel (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1175,95 +1429,97 @@ msgstr ""
 "ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
 "os ficheiros PO.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: 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:411
+#: 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:414 src/msgcomm.c:405
+#: 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:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "requírense exactamente dous ficheiros de entrada"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1281,37 +1537,39 @@ msgstr ""
 " traducidas. Cando non é posíbel atopar unha coincidencia exacta, úsase\n"
 "coincidencia difusa, de xeito que se produza un mellor diagnóstico.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traducións\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operación:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 
-#: src/msgcmp.c:245
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
@@ -1326,17 +1584,17 @@ msgstr "esta mensaxe está sen traducir"
 msgid "this message needs to be reviewed by the translator"
 msgstr "esta mensaxe ten que ser revisada polo tradutor"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensaxe úsase mais non está definida..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais esta definición é semellante"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensaxe úsase mais non está definida en %s"
@@ -1346,19 +1604,19 @@ msgstr "esta mensaxe úsase mais non está definida en %s"
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:316
+#: 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:364
+#: 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"
@@ -1379,16 +1637,17 @@ msgstr ""
 "ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
 "os ficheiros PO.\n"
 
-#: src/msgcomm.c:402
+#: 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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
 #: src/msgconv.c:311
@@ -1406,30 +1665,31 @@ msgstr ""
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "non se indicou ningún ficheiro de entrada"
@@ -1458,17 +1718,17 @@ msgstr ""
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "falta o nome da orde"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1478,491 +1738,565 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:276
 #, 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:281 src/msgfilter.c:420
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "entrada estándar"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "produciuse un erro ao escribir a stdout"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "falta o nome do filtro"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "tense que indicar polo menos un script de sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:441
 #, 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:440
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
+
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:545
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:551
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s son mutuamente excluíntes en %s"
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "non é posíbel crear o ficheiro de saída «%s»"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaxe traducida"
 msgstr[1] "%d mensaxes traducidas"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d tradución dubidosa"
 msgstr[1] ", %d traducións dubidosas"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:886
 #, 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:774
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
-#, 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:790
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "                                (só linguaxe C++)\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:981
 #, 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:851
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:991
 #, 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:861
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:871 src/xgettext.c:934
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, 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/msgfmt.c:874
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "aviso: a conversión de xogo de caracteres non vai funcionar\n"
 
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr ""
-
-#: src/msgfmt.c:1052
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:1211
 #, 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:1081
+#: src/msgfmt.c:1216
 #, 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:1095
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "ignorouse a directiva «domain %s»"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignorouse a entrada «msgstr» baleira"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignorouse a entrada «msgstr» dubidosa"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
 
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: 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:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:163 src/x-python.c:176 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-vala.c:176
-#: src/x-ycp.c:91
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "produciuse un erro ao ler «%s»"
 
 #: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
 msgstr ""
 
 #: src/msggrep.c:521
@@ -2014,7 +2348,8 @@ msgstr ""
 
 #: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
 #: src/msggrep.c:623
@@ -2027,14 +2362,16 @@ msgstr ""
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:297
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2042,139 +2379,147 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:347
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:371
 #, 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:377
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:385
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:391
 #, 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:400
+#: src/msginit.c:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:402
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:468
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:489
+#: src/msginit.c:493
 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: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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
 #: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
-msgid "domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 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:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "aviso: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, 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:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2183,7 +2528,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2192,12 +2537,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2205,7 +2550,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2214,7 +2559,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2222,125 +2567,152 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor de nplurals incorrecto"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "pero algunhas mensaxes só teñen unha forma plural"
 msgstr[1] "pero algunhas mensaxes só teñen %lu formas plurais"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:494
 #, 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:514
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
+#: src/msgl-check.c:616
 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»"
+msgstr ""
+"as entradas «msgid» e «msgid_plural» non comezan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:623
 #, 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:634
+#: src/msgl-check.c:639
 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:652
+#: src/msgl-check.c:657
 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»"
+msgstr ""
+"as entradas «msgid» e «msgid_plural» non rematan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:664
 #, 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:675
+#: src/msgl-check.c:680
 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:687
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:739
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:801
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "o campo «%s» da cabeceira aínda ten o valor inicial predefinido\n"
 
-#: src/msgl-check.c:816
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "falta o campo «%s» na cabeceira\n"
 
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2349,39 +2721,51 @@ msgstr ""
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: produciuse un erro ao converter desde a codificación «%s» á codificación «%s»"
+msgstr ""
+"%s: produciuse un erro ao converter desde a codificación «%s» á codificación "
+"«%s»"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Non é posíbel converter desde «%s» a «%s». %s depende de iconv(), e iconv() non admite esta conversión."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Non é posíbel converter desde «%s» a «%s». %s depende de iconv(), e iconv() "
+"non admite esta conversión."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Non é posíbel converter desde «%s» a «%s». %s depende de iconv(). Esta versión compilouse sen iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Non é posíbel converter desde «%s» a «%s». %s depende de iconv(). Esta "
+"versión compilouse sen iconv()."
 
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s só é válido con %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2405,54 +2789,55 @@ msgstr ""
 "non se atope ningunha coincidencia exacta, empregarase coincidencia difusa\n"
 "para producir mellores resultados.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2460,40 +2845,52 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:557
+#: src/msgmerge.c:610
+#, c-format
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensaxe debe definir formas plurais"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensaxe non debe definir formas plurais"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sLeronse %ld antigas + %ld referencias, mesturadas %ld, dubidosas %ld, faltan %ld, obsoletas %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLeronse %ld antigas + %ld referencias, mesturadas %ld, dubidosas %ld, "
+"faltan %ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " rematado.\n"
@@ -2515,7 +2912,9 @@ msgstr ""
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 
 #: src/msgunfmt.c:442
@@ -2525,12 +2924,15 @@ msgstr ""
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 
 #: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
 #: src/msgunfmt.c:451
@@ -2546,7 +2948,8 @@ msgstr ""
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
@@ -2604,7 +3007,9 @@ msgstr ""
 
 #: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
@@ -2619,7 +3024,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "O xogo de caracteres «%s» non ten un nome de codificación portábel.\n"
-"A conversión da mensaxe ao xogo de caracteres do usuario podería non funcionar.\n"
+"A conversión da mensaxe ao xogo de caracteres do usuario podería non "
+"funcionar.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -2663,32 +3069,32 @@ msgstr ""
 "Falta o xogo de caracteres na cabeceira.\n"
 "A conversión da mensaxe ao xogo de caracteres do usuario non vai funcionar.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "falta a sección «msgstr[]»"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "falta a sección «msgid_plural»"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "falta a sección «msgstr»"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "a primeira forma do plural ten un índice distinto a cero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "a forma do plural ten un índice erróneo"
@@ -2698,7 +3104,7 @@ msgstr "a forma do plural ten un índice erróneo"
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secuencia multibyte non válida"
@@ -2708,77 +3114,114 @@ msgstr "secuencia multibyte non válida"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secuencia multibyte incompleta ao final do ficheiro"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secuencia multibyte incompleta ao final da liña"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "fallo de iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave «%s» descoñecida"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control incorrecta"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de ficheiro nunha cadea"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de liña nunha cadea"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "definición de mensaxe duplicada"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "este é o lugar da primeira definición"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+#, fuzzy
+#| msgid "warning: invalid Unicode character"
+msgid "invalid non-blank character"
+msgstr "aviso: carácter Unicode incorrecto"
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "falta o nome do filtro"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "valor de nplurals incorrecto"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "o ficheiro «%s» está truncado"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro «%s» non está no formato .mo de GNU"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL, en %s"
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr ""
 
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "aviso: carácter Unicode incorrecto"
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "aviso: cadea non rematada"
@@ -2791,7 +3234,7 @@ msgstr "aviso: erro de sintaxe"
 msgid "warning: unterminated key/value pair"
 msgstr ""
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 
@@ -2799,7 +3242,7 @@ msgstr ""
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s e %s.\n"
@@ -2808,149 +3251,170 @@ msgstr "Escrito por %s e %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "produciuse un erro ao converter desde a codificación «%s» á codificación «%s»"
+msgstr ""
+"produciuse un erro ao converter desde a codificación «%s» á codificación «%s»"
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "agardábanse dous argumentos"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uso: %s [OPCIÓN] URL FICHEIRO\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, 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:228
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "produciuse un erro ao ler «%s»"
 
-#: src/urlget.c:234
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "produciuse un erro ao escribir en stdout"
 
-#: src/urlget.c:238
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "produciuse un erro despois de ler «%s»"
 
-#: src/urlget.c:264
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Obtendo %s..."
 
-#: src/urlget.c:308
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr ""
 
-#: src/urlget.c:445
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " fallou.\n"
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr ""
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr ""
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "non é posíbel crear o ficheiro de saída «%s»"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "saída estándar"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "produciuse un erro ao crear o directorio «%s»"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "produciuse un erro ao abrir «%s» para escribir"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "non é un nome de clase Java válido: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "produciuse un erro ao abrir «%s» para escribir"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "secuencia multibyte non válida"
 
-#: src/write-po.c:875
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "as mensaxes internacionalizadas non deben conter a secuencia de escape «\\%c»"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"as mensaxes internacionalizadas non deben conter a secuencia de escape «\\%c»"
 
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2959,7 +3423,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2968,81 +3432,102 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "produciuse un erro ao escribir ao subproceso %s"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: cadea non rematada"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: expresión regular non rematada"
 
-#: src/x-c.c:1051
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "aviso: carácter Unicode incorrecto"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: aviso: carácter Unicode incorrecto"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3074,7 +3559,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo de iconv"
@@ -3086,548 +3571,703 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: aviso: carácter Unicode incorrecto"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: constante de cadea non rematada"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
+#: src/xgettext.c:567
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/x-glade.c:417
+#: src/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language '%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "linguaxe «%s» descoñecida"
+
+#: src/xgettext.c:646
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/xgettext.c:701
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr "non é posíbel usar --join-existing cando a saída se escribe en stdout"
 
-#: src/x-glade.c:606
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"A linguaxe «glade» non está admitida. %s depende de expat.\n"
-"Esta versión compilouse sen expat.\n"
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext non funciona sen palabras clave polas que buscar"
 
-#: src/x-java.c:494
+#: src/xgettext.c:839
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-javascript.c:230
-msgid "Please specify the source encoding through --from-code\n"
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/x-javascript.c:275
+#: src/xgettext.c:938
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
+"aviso: o ficheiro «%s» coa extensión «%s» é descoñecido; tentarase con C"
 
-#: src/x-javascript.c:291
+#: src/xgettext.c:1027
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
+msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/x-javascript.c:303
+#: src/xgettext.c:1050
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code\n"
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 
-#: src/x-javascript.c:312
+#: src/xgettext.c:1052
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code\n"
+msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/x-javascript.c:344
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/x-javascript.c:954
+#: src/xgettext.c:1059
 #, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
+msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/x-javascript.c:1055
+#: src/xgettext.c:1061
 #, c-format
-msgid "%s:%d: warning: %s is not allowed"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: aviso: cadea non rematada"
-
-#: src/x-perl.c:308
+#: src/xgettext.c:1068
 #, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/x-perl.c:1043
+#: src/xgettext.c:1070
 #, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 
-#: src/x-perl.c:1163
+#: src/xgettext.c:1075
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/xgettext.c:1078
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/x-perl.c:1217
+#: src/xgettext.c:1083
 #, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/x-perl.c:1230
+#: src/xgettext.c:1085
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/xgettext.c:1087
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgid ""
+"  -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/x-python.c:278
+#: src/xgettext.c:1092
+#, c-format
 msgid ""
-"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"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/x-python.c:324
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/xgettext.c:1101
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "Language specific options:\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/xgettext.c:1103
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/xgettext.c:1118
 #, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/xgettext.c:1121
 #, c-format
-msgid "%s:%d: invalid string definition"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/x-rst.c:172
+#: src/xgettext.c:1126
 #, c-format
-msgid "%s:%d: missing number after #"
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/x-rst.c:207
+#: src/xgettext.c:1128
 #, c-format
-msgid "%s:%d: invalid string expression"
+msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: src/xgettext.c:1130
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr ""
 
-#: src/x-vala.c:413
+#: src/xgettext.c:1132
 #, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: aviso: literal de cadea non rematada"
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (só linguaxe C++)\n"
 
-#: src/xgettext.c:545
+#: src/xgettext.c:1134
 #, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:648
-#, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "non é posíbel usar --join-existing cando a saída se escribe en stdout"
-
-#: src/xgettext.c:653
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext non funciona sen palabras clave polas que buscar"
-
-#: src/xgettext.c:808
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "aviso: o ficheiro «%s» coa extensión «%s» é descoñecido; tentarase con C"
+msgid "                                (only language C++)\n"
+msgstr "                                (só linguaxe C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:1138
 #, c-format
-msgid "Extract translatable strings from given input files.\n"
+msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:1142
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:1146
 #, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:1171
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "  def.po                      translations\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "  def.po                      traducións\n"
+
+#: src/xgettext.c:1188
 #, c-format
-msgid "Choice of input file language:\n"
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:893
+#: src/xgettext.c:1190
 #, c-format
 msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:1192
 #, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:1194
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:1198
 #, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:1201
 #, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:1597
 #, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:919
-#, c-format
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "entrada estándar"
+
+#: src/xgettext.c:1872
 msgid ""
-"  -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"
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:2088
 #, c-format
-msgid "Language specific options:\n"
+msgid "language '%s' unknown"
+msgstr "linguaxe «%s» descoñecida"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/x-javascript.c:275
 #, c-format
-msgid "  -a, --extract-all           extract all strings\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/x-javascript.c:919
 #, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/x-javascript.c:1027
 #, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgid "%s:%d: warning: %s is not allowed"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: aviso: cadea non rematada"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "      --qt                    recognize Qt format strings\n"
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/x-perl.c:1074
 #, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (só linguaxe C++)\n"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr ""
 
-#: src/xgettext.c:958
+#: src/x-perl.c:1195
 #, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/x-perl.c:1215
 #, c-format
-msgid "      --boost                 recognize Boost format strings\n"
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/x-perl.c:1249
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/x-perl.c:1262
 #, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/x-perl.c:1279
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:1008
-#, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+#: src/x-python.c:279
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/x-python.c:325
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/x-python.c:342
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/x-python.c:355
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/x-python.c:365
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/x-python.c:398
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/x-python.c:654
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/xgettext.c:1965
-msgid "standard input"
-msgstr "entrada estándar"
-
-#: src/xgettext.c:2071
+#: src/x-rst.c:116
 #, c-format
-msgid "Non-ASCII character at %s%s."
+msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/x-rst.c:180
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
+msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/x-rst.c:215
 #, c-format
-msgid "Non-ASCII string at %s%s."
+msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/x-rst.c:676
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: aviso: "
+msgid "%s:%d: invalid JSON syntax"
+msgstr ""
 
-#: src/xgettext.c:2189
+#: src/x-rst.c:683
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: invalid RSJ syntax"
 msgstr ""
 
-#: src/xgettext.c:2190
+#: src/x-rst.c:691
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/x-sh.c:1101
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:2283
-msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+#: src/x-vala.c:616
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
 msgstr ""
 
-#: src/xgettext.c:2979
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "secuencia de control incorrecta"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "non é un nome de clase Java válido: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "non é un nome de clase Java válido: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "secuencia de control incorrecta"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
 msgstr ""
 
-#: src/xgettext.c:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "secuencia multibyte non válida"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "argumento incorrecto %s para %s"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid "missing '%c'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid "missing '%c' or '%c'"
 msgstr ""
 
-#: src/xgettext.c:3419
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
 msgstr ""
 
-#: src/xgettext.c:3638
-#, c-format
-msgid "language '%s' unknown"
-msgstr "linguaxe «%s» descoñecida"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
 
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "falta o nome do filtro"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
 msgstr ""
 
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opción «--%s» non permite ningún argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opción «--%s» non recoñecida\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: a opción «-W %s» non permite un argumento\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opción «-W %s» require un argumento\n"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "A linguaxe «glade» non está admitida. %s depende de expat.\n"
+#~ "Esta versión compilouse sen expat.\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: aviso: "
+
 #~ 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\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "algúns campos da cabeceira aínda teñen o valor inicial predefinido\n"
+#~ msgstr ""
+#~ "algúns campos da cabeceira aínda teñen o valor inicial predefinido\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 NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Isto é software libre; vexa o código para as condicións de copia.  NON hai\n"
+#~ "Isto é software libre; vexa o código para as condicións de copia.  NON "
+#~ "hai\n"
 #~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
 #~ "FIN DETERMINADO.\n"
 
@@ -3644,7 +4284,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] [[DOMINIO] MSGID | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=DOMINIO      obte-las mensaxes traducidas do DOMINIO\n"
-#~ "  -e                        permiti-la expansión dalgunhas secuencias de escape\n"
+#~ "  -e                        permiti-la expansión dalgunhas secuencias de "
+#~ "escape\n"
 #~ "  -E                        (ignorado por compatibilidade)\n"
 #~ "  -h, --help                mostrar esta axuda e saír\n"
 #~ "  -n                        suprimi-lo carácter de nova liña\n"
@@ -3654,17 +4295,23 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Se non se indica o parámetro DOMINIO, o dominio obténse da variable de ambiente\n"
+#~ "Se non se indica o parámetro DOMINIO, o dominio obténse da variable de "
+#~ "ambiente\n"
 #~ "TEXTDOMAIN.  Se o catálogo de mensaxes non está no directorio habitual,\n"
 #~ "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
 #~ "Cando se usa a opción -s, o programa compórtase como o comando `echo'.\n"
@@ -3681,57 +4328,77 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] FICHEIRO ...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
+#~ "para\n"
 #~ "as opcións curtas.\n"
 #~ "  -d, --default-domain=NOME      usar NOME.po para a saída (en vez de\n"
 #~ "                                 messages.po)\n"
 #~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
 #~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na saída\n"
+#~ "  -e, --no-escape                non usar secuencias de escape de C na "
+#~ "saída\n"
 #~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na saída,\n"
+#~ "  -E, --escape                   usar secuencias de escape de C na "
+#~ "saída,\n"
 #~ "                                 sen caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada do\n"
+#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
+#~ "do\n"
 #~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea baleiro\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola posición do ficheiro\n"
+#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
+#~ "baleiro\n"
+#~ "  -F, --sort-by-file             ordena-la saída pola posición do "
+#~ "ficheiro\n"
 #~ "  -h, --help                     amosar esta axuda e saír\n"
 
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo indentado\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:liña'\n"
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:liña' (defecto)\n"
+#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
+#~ "indentado\n"
+#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
+#~ "liña'\n"
+#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
+#~ "liña' (defecto)\n"
 #~ "      --omit-header              non escribi-la entrada `msgid \"\"' na\n"
 #~ "                                 cabeceira\n"
 #~ "  -o, --output=FICHEIRO          escribi-la saída ao ficheiro indicado\n"
 #~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
 #~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo Uniforum\n"
+#~ "      --strict                   escribi-lo ficheiro .po de tipo "
+#~ "Uniforum\n"
 #~ "                                 estricto\n"
 #~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
-#~ "  -u, --unique                   atallo para --less-than=2, só escribi-las\n"
+#~ "  -u, --unique                   atallo para --less-than=2, só escribi-"
+#~ "las\n"
 #~ "                                 mensaxes únicas\n"
 
 #~ msgid ""
@@ -3739,12 +4406,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -3759,16 +4430,21 @@ msgstr ""
 #~ "Uso: %s [OPCIÓN] ficheiro.po ...\n"
 #~ "Xera un catálogo de mensaxes binario a partir da descripción textual da\n"
 #~ "traducción.\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "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"
-#~ "  -c, --check                 facer comprobacións dependentes da linguaxe\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"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de ficheiros\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "ficheiros\n"
 #~ "                              de entrada\n"
 #~ "  -f, --use-fuzzy             utiliza-las entradas fuzzy na saída\n"
 #~ "  -h, --help                  amosar esta axuda e saír\n"
-#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro binario\n"
+#~ "      --no-hash               non incluí-la tabla \"hash\" no ficheiro "
+#~ "binario\n"
 #~ "  -o, --output-file=FICHEIRO  especifica-lo nome do ficheiro de saída\n"
 #~ "      --statictics            escribi-las estatísticas das traduccións\n"
 #~ "      --strict                emprega-lo modo Uniforum estricto\n"
@@ -3777,7 +4453,8 @@ msgstr ""
 #~ "\n"
 #~ "Empregando a opción -v máis dunha vez, o nivel de detalle increméntase.\n"
 #~ "\n"
-#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de saída\n"
+#~ "Se o ficheiro de entrada é -, lese da entrada estándar.  Se o ficheiro de "
+#~ "saída\n"
 #~ "é -, o resultado escríbese na saída estándar.\n"
 
 #~ msgid "while creating hash table"
@@ -3787,7 +4464,8 @@ msgstr ""
 #~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
 #~ "%*s  warning: charset conversion will not work"
 #~ msgstr ""
-#~ "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
+#~ "%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"
 
 #~ msgid "field `%s' still has initial default value"
@@ -3796,9 +4474,11 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
 #~ "                              may be specified more than once\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -e, --no-escape             do not use C escapes in output (default)\n"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
@@ -3806,7 +4486,8 @@ msgstr ""
 #~ "  -i, --indent                indented output style\n"
 #~ "  -o, --output-file=FILE      result will be written to FILE\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ "  -V, --version               output version information and exit\n"
@@ -3815,20 +4496,26 @@ msgstr ""
 #~ "Uso: %s [OPCIÓN] def.po ref.po\n"
 #~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios\n"
 #~ "para as opcións curtas.\n"
-#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de mensaxes,\n"
+#~ "  -C, --compendium=FICHEIRO   biblioteca adicional de traduccións de "
+#~ "mensaxes,\n"
 #~ "                              pode ser indicada máis dunha vez\n"
-#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de ficheiros\n"
+#~ "  -D, --directory=DIRECTORIO  engadir DIRECTORIO á lista de busca de "
+#~ "ficheiros\n"
 #~ "                              de entrada\n"
-#~ "  -e, --no-escape             non usar secuencias de escape de C na saída\n"
+#~ "  -e, --no-escape             non usar secuencias de escape de C na "
+#~ "saída\n"
 #~ "                              (opción por defecto)\n"
-#~ "  -E, --escape                usar secuencias de escape de C na saída, sen\n"
+#~ "  -E, --escape                usar secuencias de escape de C na saída, "
+#~ "sen\n"
 #~ "                              caracteres estendidos\n"
-#~ "      --force-po              escribi-lo ficheiro po aínda que estea baleiro\n"
+#~ "      --force-po              escribi-lo ficheiro po aínda que estea "
+#~ "baleiro\n"
 #~ "  -h, --help                  amosar esta axuda e saír\n"
 #~ "  -i, --indent                estilo de saída indentado\n"
 #~ "  -o, --output-file=FICHEIRO  escribi-lo resultado en FICHEIRO\n"
 #~ "      --no-location           suprimi-las liñas '#: ficheiro:liña'\n"
-#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por omisión)\n"
+#~ "      --add-location          mante-las liñas '#: ficheiro:liña' (por "
+#~ "omisión)\n"
 #~ "      --strict                estilo de saída Uniforum estricto\n"
 #~ "  -v, --verbose               incrementa-lo nivel de detalle\n"
 #~ "  -V, --version               amosa-la información da versión e saír\n"
@@ -3842,22 +4529,27 @@ msgstr ""
 #~ "      --force-po           write PO file even if empty\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] [FICHEIRO]...\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
+#~ "para\n"
 #~ "as opcións curtas.\n"
-#~ "  -e, --no-escape          non usar secuencias de escape de C na saída (por\n"
+#~ "  -e, --no-escape          non usar secuencias de escape de C na saída "
+#~ "(por\n"
 #~ "                           defecto)\n"
 #~ "  -E, --escape             usar secuencias de escape de C na saída, sen\n"
 #~ "                           caracteres estendidos\n"
-#~ "      --force-po           escribi-lo ficheiro PO aínda que estea baleiro\n"
+#~ "      --force-po           escribi-lo ficheiro PO aínda que estea "
+#~ "baleiro\n"
 #~ "  -h, --help               amosar esta axuda e saír\n"
 #~ "  -i, --indent             escribi-la saída cun estilo indentado\n"
-#~ "  -o, --output-file=FICH   escribi-la saída en FICH en vez da saída estándar\n"
+#~ "  -o, --output-file=FICH   escribi-la saída en FICH en vez da saída "
+#~ "estándar\n"
 #~ "  -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"
 
@@ -3871,7 +4563,8 @@ msgstr ""
 #~ "\n"
 #~ "Converte ficheiros .mo binarios en ficheiros .po de estilo Uniforum.\n"
 #~ "Manéxanse ficheiros .po little-endian e big-endian.\n"
-#~ "Se non se indicou un ficheiro de entrada, ou é -, lese a entrada estándar\n"
+#~ "Se non se indicou un ficheiro de entrada, ou é -, lese a entrada "
+#~ "estándar\n"
 #~ "Por defecto a saída escríbese na saída estándar.\n"
 
 #~ msgid "seek \"%s\" offset %ld failed"
@@ -3885,29 +4578,38 @@ msgstr ""
 #~ "  -h, --help                display this help and exit\n"
 #~ "  -V, --version             display version information and exit\n"
 #~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] [DOMINIO] MSGID MSGID-PLURAL CONTADOR\n"
 #~ "  -d, --domain=DOMINIO      obte-la mensaxe traducida do DOMINIO\n"
-#~ "  -e                        permiti-la expansión dalgunhas secuencias de escape\n"
+#~ "  -e                        permiti-la expansión dalgunhas secuencias de "
+#~ "escape\n"
 #~ "  -E                        (ignorada por compatibilidade)\n"
 #~ "  -h, --help                amosar esta axuda e saír\n"
 #~ "  -V, --version             amosa-la información da versión e saír\n"
 #~ "  [DOMINIO]                 obte-la mensaxe traducida do DOMINIO\n"
-#~ "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  CONTADOR                  escoller a forma singular/plural segundo este valor\n"
+#~ "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  CONTADOR                  escoller a forma singular/plural segundo este "
+#~ "valor\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Se non se indica o parámetro DOMINIO, o dominio obtense da variable de ambiente\n"
+#~ "Se non se indica o parámetro DOMINIO, o dominio obtense da variable de "
+#~ "ambiente\n"
 #~ "TEXTDOMAIN.  Se o catálogo de mensaxes non está no directorio habitual,\n"
 #~ "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
 #~ "Directorio estándar de busca: %s\n"
@@ -3924,24 +4626,32 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Uso: %s [OPCIÓN] FICHEIRO_ENTRADA ...\n"
 #~ "Extrae as cadeas traducibles dos ficheiros de entrada indicados.\n"
 #~ "\n"
-#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios para\n"
+#~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
+#~ "para\n"
 #~ "as opcións curtas.\n"
 #~ "  -a, --extract-all              extraer tódalas cadeas\n"
 #~ "  -c, --add-comments[=ETIQUETA]  poñe-los bloques de comentarios con\n"
-#~ "                                 ETIQUETA (ou os que preceden ás liñas de\n"
+#~ "                                 ETIQUETA (ou os que preceden ás liñas "
+#~ "de\n"
 #~ "                                 palabras chave) no ficheiro de saída\n"
 #~ "  -C, --c++                      atallo para --language=C++\n"
 #~ "      --debug                    producir resultados máis detallados do\n"
@@ -3950,51 +4660,73 @@ msgstr ""
 #~ "                                 messages.po)\n"
 #~ "  -D, --directory=DIRECTORIO     engadir DIRECTORIO á lista de busca de\n"
 #~ "                                 ficheiros de entrada\n"
-#~ "  -e, --no-escape                non usar secuencias de escape de C na saída\n"
+#~ "  -e, --no-escape                non usar secuencias de escape de C na "
+#~ "saída\n"
 #~ "                                 (opción por defecto)\n"
-#~ "  -E, --escape                   usar secuencias de escape de C na saída, sen\n"
+#~ "  -E, --escape                   usar secuencias de escape de C na saída, "
+#~ "sen\n"
 #~ "                                 caracteres estendidos\n"
-#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada de\n"
+#~ "  -f, --files-from=FICHEIRO      obte-la lista de ficheiros de entrada "
+#~ "de\n"
 #~ "                                 FICHEIRO\n"
-#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea baleiro\n"
+#~ "      --force-po                 escribi-lo ficheiro PO aínda que estea "
+#~ "baleiro\n"
 #~ "      --foreign-user             non amosa-lo copyright da FSF para os\n"
 #~ "                                 usuarios non ingleses\n"
-#~ "  -F, --sort-by-file             ordena-la saída pola localización do ficheiro\n"
+#~ "  -F, --sort-by-file             ordena-la saída pola localización do "
+#~ "ficheiro\n"
 
 #~ msgid ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                     amosar esta axuda e saír\n"
-#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo indentado\n"
-#~ "  -j, --join-existing            mestura-las mensaxes co ficheiro existente\n"
-#~ "  -k, --keyword[=PALABRA]        buscar palabra chave adicional (sen PALABRA\n"
-#~ "                                 indica que non se usen as palabras chave\n"
+#~ "  -i, --indent                   escribi-lo ficheiro .po cun estilo "
+#~ "indentado\n"
+#~ "  -j, --join-existing            mestura-las mensaxes co ficheiro "
+#~ "existente\n"
+#~ "  -k, --keyword[=PALABRA]        buscar palabra chave adicional (sen "
+#~ "PALABRA\n"
+#~ "                                 indica que non se usen as palabras "
+#~ "chave\n"
 #~ "                                 por defecto)\n"
-#~ "  -L, --language=NOME            recoñece-la linguaxe indicada (C, C++, PO),\n"
-#~ "                                 doutro xeito adivíñase a partir da extensión\n"
+#~ "  -L, --language=NOME            recoñece-la linguaxe indicada (C, C++, "
+#~ "PO),\n"
+#~ "                                 doutro xeito adivíñase a partir da "
+#~ "extensión\n"
 #~ "                                 do ficheiro\n"
 #~ "  -m, --msgstr-prefix[=CADEA]    usar CADEA ou \"\" como prefixo para as\n"
 #~ "                                 entradas msgstr\n"
 #~ "  -M, --msgstr-suffix[=CADEA]    usar CADEA ou \"\" como sufixo para as\n"
 #~ "                                 entradas msgstr\n"
-#~ "      --no-location              non escribi-las liñas '#: ficheiro:liña'\n"
+#~ "      --no-location              non escribi-las liñas '#: ficheiro:"
+#~ "liña'\n"
 
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -4002,18 +4734,21 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             xera-las liñas '#: ficheiro:liña' (defecto)\n"
+#~ "  -n, --add-location             xera-las liñas '#: ficheiro:"
+#~ "liña' (defecto)\n"
 #~ "      --omit-header              non escribi-la cabeceira coa entrada\n"
 #~ "                                 `msgid \"\"'\n"
 #~ "  -o, --output=FICHEIRO          escribi-la saída no ficheiro indicado\n"
 #~ "  -p, --output-dir=DIRECTORIO    pó-los ficheiros de saída no DIRECTORIO\n"
 #~ "  -s, --sort-output              ordena-la saída e quita-los duplicados\n"
-#~ "      --strict                   escribi-lo ficheiro .po de tipo Uniforum\n"
+#~ "      --strict                   escribi-lo ficheiro .po de tipo "
+#~ "Uniforum\n"
 #~ "                                 estricto\n"
 #~ "  -T, --trigraphs                entende-los trigrafos ANSI C na entrada\n"
 #~ "  -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"
-#~ "  -x, --exclude-file=FICHEIRO    non extrae-las entradas indicadas en FICHEIRO\n"
+#~ "  -x, --exclude-file=FICHEIRO    non extrae-las entradas indicadas en "
+#~ "FICHEIRO\n"
 #~ "\n"
 #~ "Se o FICHEIRO_ENTRADA é -, lese a entrada estándar.\n"
 
@@ -4021,4 +4756,5 @@ msgstr ""
 #~ msgstr "%s:%d: aviso: palabra chave aniñada no argumento de palabra chave"
 
 #~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr "%s:%d: aviso: palabra chave entre a palabra externa e o seu argumento"
+#~ msgstr ""
+#~ "%s:%d: aviso: palabra chave entre a palabra externa e o seu argumento"
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 8c392e012..c4d53c463 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2010-05-09 13:18+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2010-05-24 13:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -16,39 +16,41 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argumen %s tidak valid untuk %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argumen %s ambigu untuk %s"
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Argumen yang valid adalah:"
 
-#: gnulib-lib/clean-temp.c:335
+#: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
+msgstr ""
+"tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:349
+#: gnulib-lib/clean-temp.c:339
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
+msgstr ""
+"tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
 
-#: gnulib-lib/clean-temp.c:445
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "tidak dapat menghapus berkas sementara %s"
 
-#: gnulib-lib/clean-temp.c:460
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "tidak dapat menghapus direktori sementara %s"
@@ -57,145 +59,138 @@ 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: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
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
 
-#: gnulib-lib/copy-file.c:74
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
 msgstr "tidak dapat membuka berkas backup \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "error ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
-#: gnulib-lib/copy-file.c:133
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "error ketika menulis \"%s\""
 
-#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "error setelah membaca \"%s\""
 
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() gagal"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C# kompiler tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C# mesin maya tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/error.c:181
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Sistem error tidak diketahui"
 
-#: 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
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, 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"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: pilihan '%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"
-msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: pilihan tidak diketahui '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' membutuhkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: pilihan tidak diketahui '--%s'\n"
-
-#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: pilihan tidak diketahui '%c%s'\n"
-
-#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
-#: gnulib-lib/getopt.c:1053
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: pilihan '-W %s' rancu\n"
-
-#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
-
-#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argumen source_version tidak valid untuk compile_java_class"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, 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:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error ketika menulis berkas \"%s\""
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Kompiler java tidak ditemukan, coba pasang gcj atau set $JAVAC"
@@ -205,98 +200,300 @@ 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:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
 
-#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: 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
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe-filter-ii.c:313
+#, fuzzy, c-format
+#| msgid "compilation of C# class failed"
+msgid "creation of threads failed"
+msgstr "kompilasi dari kelas C# gagal"
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
-msgid "cannot create pipe"
-msgstr "tidak dapat membuat pipe"
+msgid "write to %s subprocess failed"
+msgstr "tulis ke %s subproses gagal"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "baca dari %s subproses gagal"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "komunikasi dengan %s subproses gagal"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s subproses berakhir dengan kode keluar %d"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
-#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:272
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:273
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:40
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "tidak dapat membuat pipe"
+
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gagal"
 
-#: gnulib-lib/w32spawn.h:81
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "tidak dapat mengembalikan deskripsi berkas %d: dup2 gagal"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s subproses"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subproses mendapatkan sinyal fatal %d"
 
-#: src/format.c:148
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "'%s' bukan sebuah format string %s yang sah, tidak seperti '%s'. Karena: %s"
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Penggunaan: %s [PILIHAN] [BERKAS]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Argumen wajib ke pilihan panjang juga wajib untuk pilihan pendek juga.\n"
+"Sama untuk opsional argumen.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Hak Cipta (C) %s Free Software Foundation, Inc.\n"
+"Lisensi GPLv3+: GNU GPL versi 3 atau selanjutnya <http://gnu.prg/licenses/gpl.html>\n"
+"Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
+"TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Ditulis oleh %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "tidak dapat menghapus direktori sementara %s"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "error ketika membuka \"%s\" untuk dibaca"
 
 #: 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:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "sebuah spesifikasi format untuk argumen %u, seperti dalam '%s', tidak ada dalam '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"sebuah spesifikasi format untuk argumen %u, seperti dalam '%s', tidak ada "
+"dalam '%s'"
 
 #: 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-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "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-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: 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
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen %u tidak sama"
@@ -306,55 +503,81 @@ msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen %u tidak sama"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktif nomor %u berawal dengan | tetapi tidak berakhir dengan |."
 
-#: src/format-c.c:181
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"'%s' bukan sebuah format string %s yang sah, tidak seperti '%s'. Karena: %s"
+
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Dalam direktif nomor %u, simbol setelah '<' bukan nama dari sebuah format penspesifikasi makor. Nama makro yang valid terdaftar dalam ISO C 99 bagian 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Dalam direktif nomor %u, simbol setelah '<' bukan nama dari sebuah format "
+"penspesifikasi makor. Nama makro yang valid terdaftar dalam ISO C 99 bagian "
+"7.8.1."
 
-#: src/format-c.c:588
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Dalam direktif nomor %u, token setelah '<' tidak diikuti dengan '>'."
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "String yang mereferensi ke argumen nomor %u tetapi mengabaikan argumen nomor %u."
+msgstr ""
+"String yang mereferensi ke argumen nomor %u tetapi mengabaikan argumen nomor "
+"%u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Dalam direktif nomor %u, '{' tidak diikuti dengan sebuah nomor argumen."
+msgstr ""
+"Dalam direktif nomor %u, '{' tidak diikuti dengan sebuah nomor argumen."
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Dalam direktif nomor %u, ',' tidak diikuti dengan sebuah angka."
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "String berakhir di akhir dari sebuah direktif: ditemukan '{' tanpa pencocokan '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"String berakhir di akhir dari sebuah direktif: ditemukan '{' tanpa "
+"pencocokan '}'."
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Direktif nomor %u berakhir dengan sebuah karakter tidak valid '%c' daripada '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Direktif nomor %u berakhir dengan sebuah karakter tidak valid '%c' daripada "
+"'}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Direktif nomor %u berakhir dengan sebuah karakter tidak valid daripada '}'."
+msgstr ""
+"Direktif nomor %u berakhir dengan sebuah karakter tidak valid daripada '}'."
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "String berawal di tengah dari sebuah direktif: ditemukan '}' tanpa pencocokan '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"String berawal di tengah dari sebuah direktif: ditemukan '}' tanpa "
+"pencocokan '{'."
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "String berisi sebuah '}' tunggal setelah direktif nomor %u."
@@ -371,13 +594,20 @@ msgstr "Dalam direktif nomor %u, sebuah presisi tidak diijinkan sebelum '%c'. "
 
 #: 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 "Dalam direktif nomor %u, argumen nomor untuk presisi harus sama dengan %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Dalam direktif nomor %u, argumen nomor untuk presisi harus sama dengan %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Dalam direktif nomor %u, sebuah spesifikasi presisi tidak diijinkan sebelum '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Dalam direktif nomor %u, sebuah spesifikasi presisi tidak diijinkan sebelum "
+"'%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -399,48 +629,85 @@ msgstr "'%s' menggunakan %%m tetapi '%s' tidak"
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' tidak digunakan %%m tetapi '%s' menggunakan %%m"
 
+#: src/format-gfc-internal.c:383
+#, fuzzy, c-format
+#| msgid "'%s' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "'%s' menggunakan %%m tetapi '%s' tidak"
+
+#: src/format-gfc-internal.c:386
+#, fuzzy, c-format
+#| msgid "'%s' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr "'%s' tidak digunakan %%m tetapi '%s' menggunakan %%m"
+
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "String berakhir ditengan dari sebuah direktif."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "String mereferensi ke argumen baik melalui argumen nomor absolut dan melalui spesifikasi argumen tidak bernomor."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"String mereferensi ke argumen baik melalui argumen nomor absolut dan melalui "
+"spesifikasi argumen tidak bernomor."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "Dalam direktif nomor %u, nomor argumen 0 bukan sebuah positif integer."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Dalam direktif nomor %u, lebar nomor argumen 0 bukan sebuah integer positif."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Dalam direktif nomor %u, lebar nomor argumen 0 bukan sebuah integer positif."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Dalam direktif nomor %u, argumen presisi nomor 0 bukan sebuah positif integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Dalam direktif nomor %u, argumen presisi nomor 0 bukan sebuah positif "
+"integer."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "Dalam direktif nomor %u, karakter '%c' bukan sebuah penspesifikasi konversi valid."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"Dalam direktif nomor %u, karakter '%c' bukan sebuah penspesifikasi konversi "
+"valid."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Karakter yang berakhir di direktif nomor %u bukan sebuah penspesifikasi konversi yang valid."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Karakter yang berakhir di direktif nomor %u bukan sebuah penspesifikasi "
+"konversi yang valid."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "String mereferensi ke argumen nomor %u dalam cara yang tidak kompatibel."
+msgstr ""
+"String mereferensi ke argumen nomor %u dalam cara yang tidak kompatibel."
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "dalam direktif nomor %u, substring \"%s\" bukan sebuah gaya tanggal/waktu yang valid."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"dalam direktif nomor %u, substring \"%s\" bukan sebuah gaya tanggal/waktu "
+"yang valid."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -449,13 +716,19 @@ msgstr "Dalam direktif nomor %u, \"%s\" tidak diikuti oleh sebuah koma."
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Dalam direktif nomor %u, substring \"%s\" bukan sebuah nomor gaya yang valid."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Dalam direktif nomor %u, substring \"%s\" bukan sebuah nomor gaya yang valid."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Dalam direktif nomor %u, nomor argumen tidak diikuti oleh sebuah koma dan salah satu dari \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Dalam direktif nomor %u, nomor argumen tidak diikuti oleh sebuah koma dan "
+"salah satu dari \"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
@@ -464,13 +737,20 @@ msgstr "Dalam direktif nomor %u, sebuah pilihan berisi bukan angka."
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Dalam direktif nomor %u, sebuah pilihan berisi sebuah angka yang tidak diikuti dengan '<', '#' atau '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Dalam direktif nomor %u, sebuah pilihan berisi sebuah angka yang tidak "
+"diikuti dengan '<', '#' atau '%s'."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "sebuah spesifikasi format untuk argumen {%u}, seperti dalam '%s', tidak ada dalam '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"sebuah spesifikasi format untuk argumen {%u}, seperti dalam '%s', tidak ada "
+"dalam '%s'"
 
 #: src/format-java.c:756
 #, c-format
@@ -479,127 +759,242 @@ msgstr "sebuah spesifikasi format untuk argumen {%u} tidak ada dalam '%s'"
 
 #: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen {%u} tidak sama"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
-#, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Dalam direktif nomor %u, parameter %u tipe '%s' tetapi sebuah parameter dari tipe '%s' yang diduga."
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"String yang mereferensi ke argumen nomor %u tetapi mengabaikan argumen nomor "
+"%u."
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"sebuah spesifikasi format untuk argumen %u, seperti dalam '%s', tidak ada "
+"dalam '%s'"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "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."
-msgstr[0] "Dalam direktif nomor %u, terlalu banyak parameter yang diberikan; diduga di akhir %u parameter."
-msgstr[1] "Dalam direktif nomor %u, terlalu banyak parameter yang diberikan; diduga diakhir %u parameter."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Dalam direktif nomor %u, parameter %u tipe '%s' tetapi sebuah parameter dari "
+"tipe '%s' yang diduga."
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+"Dalam direktif nomor %u, terlalu banyak parameter yang diberikan; diduga di "
+"akhir %u parameter."
+msgstr[1] ""
+"Dalam direktif nomor %u, terlalu banyak parameter yang diberikan; diduga "
+"diakhir %u parameter."
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Dalam direktif nomor %u, argumen %d negatif."
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "String berakhir ditengah dari sebuah ~/.../ direktif."
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Ditemukan '~%c' tanpa pencocokan '~%c'."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Dalam direktif nomor %u, baik @ dan pemodifikasi : diberikan."
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Dalam direktif nomor %u, '~:[]' tidak diikuti oleh dua klausa, dipisahkan oleh '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Dalam direktif nomor %u, '~:[]' tidak diikuti oleh dua klausa, dipisahkan "
+"oleh '~;'."
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "Dalam direkftif nomor %u, '~;' digunakan dalam sebuah posisi tidak valid."
+msgstr ""
+"Dalam direkftif nomor %u, '~;' digunakan dalam sebuah posisi tidak valid."
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr "String mereferensikan ke beberapa argumen dalam cara yang tidak komptibel."
+msgstr ""
+"String mereferensikan ke beberapa argumen dalam cara yang tidak komptibel."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "spesifikasi format dalam '%s' dan `%s' tidak sesuai"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "spesifikasi format dalam '%s' bukan sebuah subset dari '%s'"
 
-#: src/format-perl.c:433
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Dalam direktif nomor %u, ukuran penspesifikasi tidak kompatibel dengan penspesifkasi konversi '%c'."
-
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
 
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Dalam direktif nomor %u, ukuran penspesifikasi tidak kompatibel dengan "
+"penspesifkasi konversi '%c'."
+
+#: src/format-python-brace.c:138
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
+
+#: src/format-python-brace.c:157
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"Dalam direktif nomor %u, '{' tidak diikuti dengan sebuah nomor argumen."
+
+#: src/format-python-brace.c:171
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
+
+#: src/format-python-brace.c:193
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "Dalam direktif nomor %u, sebuah presisi tidak diijinkan sebelum '%c'. "
+
+#: src/format-python-brace.c:278
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Dalam direktif nomor %u, argumen %d negatif."
+
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "String mereferensikan argumen baik melalui nama argumen dan melalui spesifikasi argumen tidak bernama."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"String mereferensikan argumen baik melalui nama argumen dan melalui "
+"spesifikasi argumen tidak bernama."
 
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "String mereferensikan ke argumen bernama '%s' dalam cara yang tidak kompatibel."
+msgstr ""
+"String mereferensikan ke argumen bernama '%s' dalam cara yang tidak "
+"kompatibel."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "spesifikasi format dalam '%s' diduga sebuah pemetaan, baik dalam '%s' diduga sebuah tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"spesifikasi format dalam '%s' diduga sebuah pemetaan, baik dalam '%s' diduga "
+"sebuah tuple"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "spesifikasi format dalam '%s' diduga sebuah tuple, baik dalam '%s' diduga sebuah pemetaan"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"spesifikasi format dalam '%s' diduga sebuah tuple, baik dalam '%s' diduga "
+"sebuah pemetaan"
 
 #: 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 '%s'"
-msgstr "spesifikasi format untuk argumen '%s', seperti dalam '%s', tidak ada dalam '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"spesifikasi format untuk argumen '%s', seperti dalam '%s', tidak ada dalam "
+"'%s'"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen '%s' tidak sama"
 
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' sebuah format string sederhana, tetapi '%s' bukan: ini berisi sebuah tanda 'L' atau sebuah nomor argumen double-digit"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' sebuah format string sederhana, tetapi '%s' bukan: ini berisi sebuah "
+"tanda 'L' atau sebuah nomor argumen double-digit"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "String mereferensikan ke sebuah variabel shell dengan sebuah nama bukan ASCII."
+msgstr ""
+"String mereferensikan ke sebuah variabel shell dengan sebuah nama bukan "
+"ASCII."
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "String mereferensikan ke sebuah variabel shell dengan kompleks sintaks shell kompleks. Sintaks ini tidak didukung disini karena alasan keamanan."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"String mereferensikan ke sebuah variabel shell dengan kompleks sintaks shell "
+"kompleks. Sintaks ini tidak didukung disini karena alasan keamanan."
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "String mereferensikan ke sebuah variabel shell yang nilainya mungkin berbeda didalam fungsi shell."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"String mereferensikan ke sebuah variabel shell yang nilainya mungkin berbeda "
+"didalam fungsi shell."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
@@ -607,164 +1002,167 @@ msgstr "String mereferensi ke sebuah variabel shell dengan sebuah nama kosong."
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "Dalam direktif nomor %u, karakter '%c' bukan sebuah angka diantara 1 dan 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+"Dalam direktif nomor %u, karakter '%c' bukan sebuah angka diantara 1 dan 9."
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Karakter yang mengakhiri nomor direktif %u bukan sebuah angka diantara 1 dan 9."
-
-#: 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"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
-"Hak Cipta (C) %s Free Software Foundation, Inc.\n"
-"Lisensi GPLv3+: GNU GPL versi 3 atau selanjutnya <http://gnu.prg/licenses/gpl.html>\n"
-"Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
-"TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
-
-#: 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"
+"Karakter yang mengakhiri nomor direktif %u bukan sebuah angka diantara 1 dan "
+"9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: 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
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Tampilkan nama host mesin.\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format keluaran:\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nama pendek host\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          nama panjang host, termasuk fully qualified domain\n"
+"  -f, --fqdn, --long          nama panjang host, termasuk fully qualified "
+"domain\n"
 "                                nama, dan aliases\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
-#: 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
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
-#: 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "tidak dapat mendapatkan nama host"
 
-#: 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"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "paling tidak dua berkas harus dispesifikasikan"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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: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"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "tidak dapat membuat pipe"
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "tidak dapat mendapatkan nama host"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
 
-#: 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
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "argumen %s tidak valid untuk %s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "tidak dapat membuat pipe"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "tidak dapat membuat berkas output \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "di paling tidak satu berkas masukan diijinkan"
 
-#: 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
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -773,59 +1171,69 @@ msgstr ""
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\n"
 
-#: 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
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 
-#: 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
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
-#: 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
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian masukan berkas\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian "
+"masukan berkas\n"
 
-#: 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
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
+"masukan yang dibaca.\n"
 
-#: 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
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: 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
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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"
+msgstr ""
+"  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
+"dispesifikasikan\n"
 
-#: 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
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -834,242 +1242,319 @@ msgstr ""
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Pemilihan pesan:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            simpan terjemahan, hapus pesan tidak diterjemahkan\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            simpan terjemahan, hapus pesan tidak "
+"diterjemahkan\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          simpan tidak terjemahkan, hapus pesan terjemahan\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          simpan tidak terjemahkan, hapus pesan "
+"terjemahan\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            simpan pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           hapus pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         simpan pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulasi atribut:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set seluruh pesan 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "     --clear-fuzzy            set seluruh pesan non-'fuzzy'\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set seluruh pesan sudah ditinggalkan\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set seluruh pesan tidak ditinggalkan\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "      --previous              keep previous msgids of translated "
+#| "messages\n"
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              simpan msgids sebelumnya dari pesan yang "
+"diterjemahkan\n"
+
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+#| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
+
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=BERKAS.po   hanya manipulasi masukan terdaftar dalam BERKAS.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=BERKAS.po   hanya manipulasi masukan terdaftar dalam "
+"BERKAS.po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam BERKAS.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam "
+"BERKAS.po\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 sinonim untuk --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                 sinonim untuk --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete               sinonim untuk --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete               sinonim untuk --only-obsolete --clear-"
+"obsolete\n"
 
-#: 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
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: 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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      berkas masukan berada dalam .properties sintaks Java\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      berkas masukan berada dalam .properties "
+"sintaks Java\n"
 
-#: 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
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     berkas masukan berada dalam sintaks .strings NexTstep/GNUstep\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     berkas masukan berada dalam sintaks .strings "
+"NexTstep/GNUstep\n"
 
-#: 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
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: 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
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"      --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
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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"
+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
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, 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"
+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: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
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                gunakan C escape dalam keluaran, bukan karakter ekstensi\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                gunakan C escape dalam keluaran, bukan "
+"karakter ekstensi\n"
 
-#: 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
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:940
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
+msgstr ""
+"  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:942
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
+msgstr ""
+"      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:944
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:946
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                tulis strict Uniforum konform berkas .po\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                tulis strict Uniforum konform berkas .po\n"
 
-#: 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
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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: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
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
 
-#: 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
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
-#: 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
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               jangan potong baris pesan panjang, lebih panjang\n"
-"                              dari lebar halaman keluaran, dalam beberapa beris\n"
+"      --no-wrap               jangan potong baris pesan panjang, lebih "
+"panjang\n"
+"                              dari lebar halaman keluaran, dalam beberapa "
+"beris\n"
 
-#: 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
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: 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
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
+msgstr ""
+"  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
 #: 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)"
+msgstr ""
+"kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
 
 #: src/msgcat.c:371
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Concatenates and merges the specified PO files.\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be cumulated, except that if --use-first\n"
+#| "is specified, they will be taken from the first PO file to define them.\n"
+#| "File positions from all PO files will be cumulated.\n"
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1077,9 +1562,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "Potong dan gabungkan berkas PO yang dispesifikasikan.\n"
 "Temukan pesan yang umum di antara dua/lebih berkas PO yang dispesifikasikan.\n"
@@ -1090,18 +1575,20 @@ 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:379 src/xgettext.c:832
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
+"BERKAS\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
-#: src/xgettext.c:838
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
@@ -1113,7 +1600,8 @@ msgid ""
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 "  -<, --less-than=ANGKA       tampilkan pesan dengan lebih kecil dari \n"
-"                              definisi ini, baku ke tidak terhingga jika tidak diset\n"
+"                              definisi ini, baku ke tidak terhingga jika "
+"tidak diset\n"
 
 #: src/msgcat.c:410
 #, c-format
@@ -1133,60 +1621,69 @@ 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:410 src/msgfmt.c:735
-#: src/msgmerge.c:557
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      berkas masukan berada dalam sintaks .properties Java\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      berkas masukan berada dalam sintaks ."
+"properties Java\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
-#: src/msgmerge.c:559
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     berkas masukan berada dalam sintaks .strings NeXTstep/GNUstep\n"
+msgstr ""
+"      --stringtable-input     berkas masukan berada dalam sintaks .strings "
+"NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, 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:379
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             gunakan terjemahan pertama yang tersedia untuk\n"
-"                              setiap pesan, jangan gabungkan beberapa terjemahan.\n"
+"      --use-first             gunakan terjemahan pertama yang tersedia "
+"untuk\n"
+"                              setiap pesan, jangan gabungkan beberapa "
+"terjemahan.\n"
 
-#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NAMAKATALOG      isi baris 'Language' dalam masukan header\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=NAMAKATALOG      isi baris 'Language' dalam masukan header\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter MIller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "dibutuhkan tepat 2 berkas input"
 
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1203,40 +1700,45 @@ msgstr ""
 "program anda. Bilamana tidak ditemukan kecocokan yang tepat, digunakan fuzzy\n"
 "matching untuk menghasilkan diagnostik yang lebih baik.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      terjemahan\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referensi ke sumber\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operasi pemodifikasi:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:548
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          aplikasikan ref.pot ke setiap dari domain dalam def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          aplikasikan ref.pot ke setiap dari domain "
+"dalam def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     jangan gunakan fuzzy matching\n"
 
-#: src/msgcmp.c:245
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             pertimbangkan masukan fuzzy\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      pertimbangkan masukan tidak diterjemahkan\n"
+msgstr ""
+"      --use-untranslated      pertimbangkan masukan tidak diterjemahkan\n"
 
 #: src/msgcmp.c:324
 #, c-format
@@ -1248,17 +1750,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:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "pesan ini digunakan tapi tidak didefinisikan..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...tetapi definisi ini serupa"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1268,7 +1770,7 @@ msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgid "warning: this message is not used"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:553 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1281,14 +1783,23 @@ msgid "at least two files must be specified"
 msgstr "paling tidak dua berkas harus dispesifikasikan"
 
 #: src/msgcomm.c:363
-#, c-format, no-wrap
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "cumulated.\n"
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1309,65 +1820,76 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:961
-#, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
-msgstr "      --omit-header           jangan tulis header dengan masukan `msgid \"\"'\n"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, fuzzy, c-format
+#| msgid ""
+#| "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           jangan tulis header dengan masukan `msgid "
+"\"\"'\n"
 
-#: src/msgconv.c:306
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
+msgstr ""
+"Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
 
-#: src/msgconv.c:330
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Target konversi:\n"
 
-#: src/msgconv.c:334
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
 
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                gaya keluaran terindentasi\n"
 
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           tekan '#: nama berkas:baris' baris\n"
 
-#: 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:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, fuzzy, c-format
+#| msgid ""
+#| "      --add-location          preserve '#: filename:line' lines "
+#| "(default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          simpan '#: nama berkas: baris' baris (baku)\n"
 
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgen.c:253
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "tepatnya sebuah berkas masukan dibutuhkan"
 
-#: src/msgen.c:298
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1380,22 +1902,22 @@ msgstr ""
 "(secara umum dibuat oleh xgettext). Masukan yang tidak diterjemahkan diberikan\n"
 "sebuah terjemahan yang identik dengan msgid.\n"
 
-#: src/msgen.c:315
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO atau POT\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "hilang nama perintah"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN] PERINTAH [PILIHAN-PERINTAH]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1410,7 +1932,7 @@ msgstr ""
 "menjadi keluaran msgexec. msgexec mengembalikan kode yang maksimal kode kembali\n"
 "ke seluruh pemanggilan.\n"
 
-#: src/msgexec.c:271
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1419,265 +1941,377 @@ 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:401
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "standard input"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "penulisan ke stdout gagal"
 
-#: src/msgexec.c:389
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "tulis ke %s subproses gagal"
-
-#: src/msgfilter.c:289
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "hilang nama penyaring"
 
-#: src/msgfilter.c:313
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak sebuah script sed harus dispesifikasikan"
 
-#: src/msgfilter.c:388
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
 
-#: src/msgfilter.c:392
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
+"terjemahan.\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:441
 #, 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 ""
-"PENYARING dapat berupa aplikasi apapun yang membaca sebuah terjemahan dari standar masukan\n"
+"PENYARING dapat berupa aplikasi apapun yang membaca sebuah terjemahan dari "
+"standar masukan\n"
 "dan menulis sebuah terjemahan termodifikasi ke standar keluaran.\n"
 
-#: src/msgfilter.c:421
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, 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:423
+#: src/msgfilter.c:454
 #, 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"
+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:425
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=SCRIPTFILE       tambahkan isi dari SCRIPTFILE ke perintah\n"
 "                                untuk dijalankan\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       tekan pencetakan otomatis dari ruang pola\n"
+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:446 src/msggrep.c:595
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             jangan gunakan C escapes dalam keluaran (baku)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             jangan gunakan C escapes dalam keluaran "
+"(baku)\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/msgfilter.c:454
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           simpan masukan header tidak termodifikasi, janya saring itu\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           simpan masukan header tidak termodifikasi, "
+"janya saring itu\n"
+
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "berkas \"%s\" berisi bukan sebuah string berakhir NULL"
 
-#: src/msgfmt.c:304
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumen ke %s seharusnya berupa sebuah karakter punctuation tunggal"
 
-#: src/msgfmt.c:351
+#: src/msgfmt.c:419
 #, c-format
 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:268 src/xgettext.c:590
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:471
+#, fuzzy, c-format
+#| msgid "If no input file is given or if it is -, standard input is read.\n"
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
+"masukan yang dibaca.\n"
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:323 src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:362 src/msgunfmt.c:368
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s dan %s adalah mutually exclusive"
+
+#: src/msgfmt.c:626 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"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s hanya valid dengan %s, %s atau %s"
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "tidak dapat membuat berkas output \"%s\""
+
 #. 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
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:620
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 msgstr[1] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:625
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 msgstr[1] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:630
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d pesan belum diterjemahkan"
 msgstr[1] ", %d pesan belum diterjemahkan"
 
-#: src/msgfmt.c:650
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:910
 #, c-format
 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:825
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-"Argumen wajib ke pilihan panjang juga wajib untuk pilihan pendek juga.\n"
-"Sama untuk opsional argumen.\n"
-
-#: src/msgfmt.c:666
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/msgfmt.c:675
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Mode: java menghasilkan sebuah class Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Mode: java menghasilkan sebuah class Java "
+"ResourceBundle\n"
 
-#: src/msgfmt.c:677
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 seperti --java, dan asumsikan Java2 (JDK 1.2 atau lebih tinggi)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 seperti --java, dan asumsikan Java2 (JDK 1.2 "
+"atau lebih tinggi)\n"
 
-#: src/msgfmt.c:679
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# mode: hasilkan sebuah berkas .dll .NET\n"
+msgstr ""
+"      --csharp                C# mode: hasilkan sebuah berkas .dll .NET\n"
 
-#: src/msgfmt.c:681
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      mode resources C#: hasilkan sbeuah berkas .resources .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      mode resources C#: hasilkan sbeuah berkas ."
+"resources .NET\n"
 
-#: src/msgfmt.c:683
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   mode Tcl: hasilkan sebuah .tcl/msgcat\n"
 
-#: src/msgfmt.c:685
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:943
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
+
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:849
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
 
-#: src/msgfmt.c:697
+#: src/msgfmt.c:957
 #, c-format
 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:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOKAL          nama lokal, baik bahasa atau bahasa_NEGARA\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOKAL          nama lokal, baik bahasa atau bahasa_NEGARA\n"
+
+#: src/msgfmt.c:963
+#, fuzzy, c-format
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg "
+"tcl/msgcat\n"
 
-#: src/msgfmt.c:703
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIREKTORI                basis direktori dari struktur direktori kelas\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d DIREKTORI                basis direktori dari struktur direktori kelas\n"
 
-#: src/msgfmt.c:705
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 "Nama kelas ditentukan dengan cara menambahkan nama lokal ke nama resource,\n"
-"dipisahkan dengan sebuah garis bawah. Pilihan -d wajib. Kelas ditulis dibawah\n"
+"dipisahkan dengan sebuah garis bawah. Pilihan -d wajib. Kelas ditulis "
+"dibawah\n"
 "direktoris yang dispesifikasikan.\n"
 
-#: src/msgfmt.c:711
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d DIREKTORI                basis direktori untuk lokal dependen berkas .dll\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DIREKTORI                basis direktori untuk lokal dependen berkas ."
+"dll\n"
 
-#: src/msgfmt.c:719
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1686,162 +2320,253 @@ msgstr ""
 "Pilihan -l dan -d wajib. Berkas .dll ditulis dalam sebuah subdirektori\n"
 "dari direktori yang dispesifikasikan yang namanya tergantung dari lokal.\n"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
+msgstr ""
+"  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang dispesifikasikan.\n"
+msgstr ""
+"Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
+"dispesifikasikan.\n"
+
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+"  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, c-format
+msgid ""
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
+msgstr ""
+"  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
+"  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:865
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
 
-#: src/msgfmt.c:743
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 lakukan seluruh pemeriksaan mengimplikasikan oleh\n"
-"                                --check-format, --check-header, --check-domain\n"
+"  -c, --check                 lakukan seluruh pemeriksaan mengimplikasikan "
+"oleh\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          periksa format string tergantung bahasa\n"
+msgstr ""
+"      --check-format          periksa format string tergantung bahasa\n"
 
-#: src/msgfmt.c:748
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          verifikasi keberadaan dan isi dari masukan header\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          verifikasi keberadaan dan isi dari masukan "
+"header\n"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          periksa untuk konflik diantara direktif domain\n"
+"      --check-domain          periksa untuk konflik diantara direktif "
+"domain\n"
 "                               dan pilihan --output-file\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   periksa GNU msgfmt berlaku seperti X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   periksa GNU msgfmt berlaku seperti X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CHAR]  periksa keberadaan dari akselerator\n"
 "                                keyboard untuk item menu\n"
 
-#: src/msgfmt.c:758
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             gunakan masukan fuzzy dalam keluaran\n"
 
-#: src/msgfmt.c:763
+#: src/msgfmt.c:1058
+#, c-format
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=JUMLAH       align string ke JUMLAH bytes (baku: %d)\n"
+
+#: src/msgfmt.c:1060
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=JUMLAH       align string ke JUMLAH bytes (baku: %d)\n"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
 
-#: src/msgfmt.c:765
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               berkas binari tidak akan dimasukan dalam tabel hash\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               berkas binari tidak akan dimasukan dalam tabel "
+"hash\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            tampilkan statistik mengenai terjemahan\n"
+msgstr ""
+"      --statistics            tampilkan statistik mengenai terjemahan\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
 
-#: src/msgfmt.c:890
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
 
-#: src/msgfmt.c:903
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "peringatan: header berkas PO fuzzy\n"
-
-#: src/msgfmt.c:905
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error disini\n"
-
-#: src/msgfmt.c:929
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas: akan menggunakan prefix"
+msgstr ""
+"nama domain \"%s\" tidak sesuai dengan nama berkas: akan menggunakan prefix"
 
-#: src/msgfmt.c:948
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "direktif `domain %s' diabaikan"
 
-#: src/msgfmt.c:1008
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1009
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1058
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
-#: 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
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/msggrep.c:496
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "pilihan '%c' tidak dapat digunakan sebelum 'J' atau 'K' atau 'T' atau 'C' atau 'X' telah dispesifikasikan"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"pilihan '%c' tidak dapat digunakan sebelum 'J' atau 'K' atau 'T' atau 'C' "
+"atau 'X' telah dispesifikasikan"
 
-#: src/msggrep.c:516
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1850,7 +2575,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:542
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1925,32 +2650,42 @@ msgstr ""
 "  -v, --invert-match          keluarkan hanya pesan yang tidak cocok dengan\n"
 "                              kriteria pemilihan apapun\n"
 
-#: src/msggrep.c:597
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                gunakan C escapes dalam keluaran, tidak ada karakter ekstensi\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                gunakan C escapes dalam keluaran, tidak ada "
+"karakter ekstensi\n"
 
-#: src/msggrep.c:618
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msggrep.c:620
+#: src/msggrep.c:625
 #, 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:297
+msgstr ""
+"      --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Anda berada dalam sebuah bahasa yang berbeda dengan lingkungan. Mohon set\n"
 "variabel lingkungan LANG anda, seperti dijelaskan dalam berkas ABOUT-NLS.\n"
 "Ini diperlukan sehingga anda dapat memeriksa terjemahan anda.\n"
 
-#: src/msginit.c:321
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1961,12 +2696,12 @@ msgstr ""
 "Mohon spesifikasikan lokal melalui pilihan --locale atau\n"
 "berkas keluaran .po melalui pilihan --output-file.\n"
 
-#: src/msginit.c:347
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Dibuat %s.\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -1975,26 +2710,30 @@ msgstr ""
 "Dibuat sebuah berkas PO baru, menginisialisasi informasi meta dengan nilai\n"
 "lingkungan pengguna.\n"
 
-#: src/msginit.c:377
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  berkas masukan POT\n"
 
-#: src/msginit.c:379
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Jika tidak ada berkas masukan yang diberikan, direktori sekarang dicari untuk\n"
+"Jika tidak ada berkas masukan yang diberikan, direktori sekarang dicari "
+"untuk\n"
 "berkas POT. Jika ini adalah -, standar masukan dibaca.\n"
 
-#: src/msginit.c:385
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=BERKAS    tulis keluaran ke berkas PO yang "
+"dispesifikasikan\n"
 
-#: src/msginit.c:387
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2004,17 +2743,21 @@ msgstr ""
 "--locale atau konfigurasi lokal pengguna. Jika ini adalah -, hasil akan\n"
 "ditulis ke standar keluaran.\n"
 
-#: src/msginit.c:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target lokal\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         asumsikan berkas PO secara otomatis dihasilkan\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         asumsikan berkas PO secara otomatis "
+"dihasilkan\n"
 
-#: src/msginit.c:468
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2022,12 +2765,12 @@ msgstr ""
 "Ditemukan lebih dari satu berkas .pot.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui pilihan --input.\n"
 
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "error membaca direktori disini"
 
-#: src/msginit.c:489
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2035,84 +2778,104 @@ msgstr ""
 "Tidak ditemukan berkas .pot dalam direktori ini.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui pilihan --input.\n"
 
-#: 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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subproses gagal dengan kode keluar %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Pesan katalog barus seharusnya berisi alamat surat elektronik anda, jadi\n"
 "pengguna dapat memberikan umpan balik mengenai terjemahan, dan juga\n"
-"pengelola dapat menghubungi anda jika ada masalah teknis yang tidak terduga.\n"
+"pengelola dapat menghubungi anda jika ada masalah teknis yang tidak "
+"terduga.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Terjemahan bahasa inggris untuk paket %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "set karakter saat ini \"%s\" bukan sebuah nama pengkodean yang portabel"
+msgstr ""
+"set karakter saat ini \"%s\" bukan sebuah nama pengkodean yang portabel"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dua set karakter berbeda \"%s\" dan \"%s\" dalam berkas masukan"
 
 #: src/msgl-cat.c:203
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
-msgstr "berkas masukan `%s' tidak berisi sebuah masukan header dengan sebuah spesifikasi set karakter"
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"berkas masukan `%s' tidak berisi sebuah masukan header dengan sebuah "
+"spesifikasi set karakter"
 
 #: 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 "domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header dengan sebuah spesifikasi set karakter"
+#, fuzzy, c-format
+#| msgid ""
+#| "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+#| "charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header "
+"dengan sebuah spesifikasi set karakter"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 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:3015
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Berkas masukan berisi pesan dalam pengkodean yang berbeda, UTF-8 diantara lain.\n"
+"Berkas masukan berisi pesan dalam pengkodean yang berbeda, UTF-8 diantara "
+"lain.\n"
 "Mengubah keluaran ke UTF-8.\n"
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Berkas masukan berisi pesan dalam pengkodean berbeda, %s dan %s diantara yang lain.\n"
+"Berkas masukan berisi pesan dalam pengkodean berbeda, %s dan %s diantara "
+"yang lain.\n"
 "Mengubah keluaran ke UTF-8.\n"
 "Pilih sebuah keluaran pengkodean berbeda, gunakan pilihan --to-code.\n"
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2126,7 +2889,7 @@ msgstr ""
 "pastikan mereka dalam pengkodean UTF-8 sejak awal, jadi telah berada dalam.\n"
 "berkas sumber kode anda.\n"
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2139,12 +2902,12 @@ msgstr ""
 "Keluaran dari '%s' mungkin tidak benar.\n"
 "Solusi yang memungkinkan diantaranya:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Set LC_ALL ke sebuah lokal dengan pengkodean %s.\n"
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2155,7 +2918,7 @@ msgstr ""
 "  kemudian aplikasikan '%s,\n"
 "  kemudian konversi kembali ke %s menggunakan 'msgconv'.\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2168,7 +2931,7 @@ msgstr ""
 "  kemudian aplikasikan '%s,\n"
 "  kemudian konversikan kembali ke %s menggunakan 'msgconv'.\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2179,133 +2942,169 @@ msgstr ""
 "Keluaran dari '%s' mungkin tidak benar.\n"
 "Solusi yang memungkinkan adalah menset LC_ALL=C.\n"
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "ekspresi plural dapan menghasilkan nilai minus"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu tetapi ekspresi plural dapan menghasilkan nilai besar sebesar %lu"
+msgstr ""
+"nplurals = %lu tetapi ekspresi plural dapan menghasilkan nilai besar sebesar "
+"%lu"
 
-#: src/msgl-check.c:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "ekspresi plural dapan menghasilkan pembagian dengan nol"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "ekspresi plural dapat menghasilkan integer overflow"
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "ekspresi plural dapat menghasilkan eksepsi aritmetik, kemungkinan pembagian dengan nol"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"ekspresi plural dapat menghasilkan eksepsi aritmetik, kemungkinan pembagian "
+"dengan nol"
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Coba gunakan berikut, valid untuk %s:"
 
-#: src/msgl-check.c:352 src/msgl-check.c:376
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalog pesan memiliki bentuk terjemahan plural"
 
-#: src/msgl-check.c:354
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plural=EKSPRESI\""
 
-#: src/msgl-check.c:378
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plurals=BILANGAN BULAT\""
 
-#: src/msgl-check.c:414
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nilai nplurals tidak valid"
 
-#: src/msgl-check.c:436
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ekspresi plural tidak valid"
 
-#: src/msgl-check.c:466 src/msgl-check.c:482
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:468
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 
-#: src/msgl-check.c:484
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "tetapi beberapa pesan memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan memiliki bentuk %lu plural"
 
-#: 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 "katalog pesan memiliki bentuk terjemahan plural, tetapi kurang sebuah masukan header dengan \"Plural-Forms: nplurals=BILANG BULAT; plural=EKSPRESI;\""
-
-#: src/msgl-check.c:602
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"katalog pesan memiliki bentuk terjemahan plural, tetapi kurang sebuah "
+"masukan header dengan \"Plural-Forms: nplurals=BILANG BULAT; plural=EKSPRESI;"
+"\""
+
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgid_plural' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:610
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr[%u]' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:625
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:643
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr "masukan `msgid' dan `msgid_plural' keduanya tidak diakhiri dengan '\\n'"
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"masukan `msgid' dan `msgid_plural' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:651
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr[%u]' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:666
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "penanganan plural adalah sebuah ekstensi GNU gettext"
 
-#: src/msgl-check.c:720
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:776
-#, c-format
-msgid "header field `%s' missing in header\n"
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "header field `%s' still has the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "beberapa field header `%s' masih memiliki nilai baku awal\n"
+
+#: src/msgl-check.c:835
+#, fuzzy, c-format
+#| msgid "header field `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
 msgstr "header field `%s' hilang dalam header\n"
 
-#: src/msgl-check.c:784
-#, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "header field `%s' seharusnya dimulai di awal baris\n"
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:809
-msgid "some header fields still have the initial default value\n"
-msgstr "beberapa field header masih memiliki nilai baku awal\n"
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:826
+#: src/msgl-check.c:1162
 #, c-format
-msgid "header field `%s' still has the initial default value\n"
-msgstr "beberapa field header `%s' masih memiliki nilai baku awal\n"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2317,37 +3116,51 @@ msgstr "%s: masukan tidak valid dalam pengkodean \"%s\""
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "berkas masukan tidak berisi sebuah masukan header dengan sebuah spesifikasi set karakter"
+msgstr ""
+"berkas masukan tidak berisi sebuah masukan header dengan sebuah spesifikasi "
+"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:692
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(), dan iconv() tidak mendukung konversi ini."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(), dan "
+"iconv() tidak mendukung konversi ini."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Pengubahan dari \"%s\" ke \"%s\" menghadirkan duplikasi: beberapa msgids berbeda menjadi sama."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Pengubahan dari \"%s\" ke \"%s\" menghadirkan duplikasi: beberapa msgids "
+"berbeda menjadi sama."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:699
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(). Versi ini dibuat tanpa iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(). Versi "
+"ini dibuat tanpa iconv()."
 
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s hanya valid dengan %s"
 
-#: src/msgmerge.c:448
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tipe backup"
 
-#: src/msgmerge.c:485
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2369,17 +3182,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:502
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      terjemahan mereferensikan ke sumber lama\n"
+msgstr ""
+"  def.po                      terjemahan mereferensikan ke sumber lama\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referensi ke sumber baru\n"
 
-#: src/msgmerge.c:508
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2388,7 +3202,7 @@ msgstr ""
 "  -C, --compendium=BERKAS     perpustakaan tambahan dari pesan terjemahan,\n"
 "                              mungkin dispesifikasikan lebih dari sekali.\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2397,30 +3211,31 @@ msgstr ""
 "  -U, --update                perbarui def.po,\n"
 "                              jangan lakukan apapun jika def.po telah baru\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode perbarui:\n"
 
-#: src/msgmerge.c:528
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Hasil ditulis kembali ke def.po.\n"
 
-#: src/msgmerge.c:530
+#: src/msgmerge.c:590
 #, 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:532
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AKHIRAN        override akhiran backup biasa\n"
 
-#: src/msgmerge.c:534
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2429,45 +3244,68 @@ msgid ""
 msgstr ""
 "Metode kontrol versi dapat dipilih melalui pilihan --backup atau melalui\n"
 "variabel lingkungan VERSION_CONTROL. Disini adalah nilai nilainya:\n"
-"  none,off        tidak pernah membuah backup (bahkan jika --backup diberikan)\n"
+"  none,off        tidak pernah membuah backup (bahkan jika --backup "
+"diberikan)\n"
 "  numbered, t     buat backup bernomor\n"
-"  existing, nil   bernomor jika backup bernomor ada, sederhana jika tidak ada\n"
+"  existing, nil   bernomor jika backup bernomor ada, sederhana jika tidak "
+"ada\n"
 "  simple, never   selalu membuat backup sederhana\n"
 
-#: src/msgmerge.c:541
-#, c-format
+#: src/msgmerge.c:601
+#, fuzzy, c-format
+#| msgid ""
+#| "The backup suffix is `~', unless set with --suffix or the "
+#| "SIMPLE_BACKUP_SUFFIX\n"
+#| "environment variable.\n"
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
-msgstr "Akhiran backup adalah `~', kecuali diset dengan --suffix atau SIMPLE_BACKUP_SUFFIX\n"
+msgstr ""
+"Akhiran backup adalah `~', kecuali diset dengan --suffix atau "
+"SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 kenali format string Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              simpan msgids sebelumnya dari pesan yang diterjemahkan\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              simpan msgids sebelumnya dari pesan yang "
+"diterjemahkan\n"
 
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       tekan indikator perkembangan\n"
 
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pesan ini seharusnya mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pesan ini seharusnya tidak mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sMembaca %ld lama + %ld referensi, digabung %ld, fuzzy %ld, hilang %ld, sudah ditinggalkan %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sMembaca %ld lama + %ld referensi, digabung %ld, fuzzy %ld, hilang %ld, "
+"sudah ditinggalkan %ld.\n"
 
-#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
-#: src/urlget.c:435
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " selesai.\n"
@@ -2489,23 +3327,36 @@ msgstr "Konversikan katalog pesan binari ke gaya berkas .po Uniforum\n"
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Mode java: masukan adalah sebuah Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Mode java: masukan adalah sebuah Java "
+"ResourceBundle class\n"
 
 #: 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"
+msgstr ""
+"      --csharp                mode C#: masukan adalah sebuah berkas .dll ."
+"NET\n"
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      mode resources C#: masukan adalah sebuah berkas .resources .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      mode resources C#: masukan adalah sebuah "
+"berkas .resources .NET\n"
 
 #: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg "
+"tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
@@ -2520,11 +3371,13 @@ msgstr "Lokasi berkas masukan dalam mode Java:\n"
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Nama kelas ditentukan dengan menambahkan nama lokal ke nama resource,\n"
-"dipisahkan dengan sebuah garis bawah. Kelas ditempatkan menggunakan CLASSPATH.\n"
+"dipisahkan dengan sebuah garis bawah. Kelas ditempatkan menggunakan "
+"CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
@@ -2537,7 +3390,8 @@ 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 ""
-"Pilihan -l dan -d adalah wajib. Berkas .dll berada dalam sebuah subdirektori\n"
+"Pilihan -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:479
@@ -2564,7 +3418,7 @@ msgstr "  -i, --indent                tulis keluaran gaya berindentasi\n"
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                tulis gaya strict uniforum\n"
 
-#: src/msguniq.c:330
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2585,15 +3439,18 @@ msgstr ""
 ", mereka akan diambil dari terjemahan pertama. Posisi berkas akan dijaga.\n"
 "Ketika menggunakan pilihan --unique, duplikasi diabaikan.\n"
 
-#: src/msguniq.c:363
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tampilkan hanya duplikasi\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                tampilkan hanya pesan unik, abaikan duplikat\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                tampilkan hanya pesan unik, abaikan duplikat\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -2609,7 +3466,7 @@ msgstr ""
 "Set karakter \"%s\" bukan sebuah nama pengkodean yang portabel.\n"
 "Konversi pesan ke set karakter pengguna mungkin tidak bekerja.\n"
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2618,7 +3475,7 @@ msgstr ""
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv(),\n"
 "dan iconv() tidak mendukung \"%s\".\n"
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2626,15 +3483,15 @@ msgstr ""
 "Memasang GNU libiconv dan memasang ulang GNU gettext mungkin akan\n"
 "menyelesaikan masalah ini.\n"
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr "Tetap lanjutkan saja, diduga parse errors."
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr "Tetap lanjutkan saja."
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2643,7 +3500,7 @@ msgstr ""
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv().\n"
 "Konversi ini dibuat tanpa iconv().\n"
 
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2651,32 +3508,35 @@ msgstr ""
 "Set karakter hilang dalam header.\n"
 "Pesan konversi ke set karakter pengguna tidak akan bekerja.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "penggunaan tidak konsisten dari #~"
 
-#: src/po-gram-gen.y:240
-#, c-format
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "bagian `msgstr[]' hilang"
 
-#: src/po-gram-gen.y:249
-#, c-format
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "bagian `msgid_plural' hilang"
 
-#: src/po-gram-gen.y:257
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "bentuk plural pertama memiliki indeks bukan nol"
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "bentuk plural memiliki indeks salah"
@@ -2686,7 +3546,7 @@ msgstr "bentuk plural memiliki indeks salah"
 msgid "too many errors, aborting"
 msgstr "terlalu banyak kesalahan, membatalkan"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "urutan multibyte tidak valid"
@@ -2696,77 +3556,115 @@ msgstr "urutan multibyte tidak valid"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "urutan multibyte tidak lengkap di akhir dari berkas"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "urutan multibyte tidak lengkap di akhir dari baris"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv gagal"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kata kunci \"%s\" tidak dikenal"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "urutan kontrol tidak valid"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "akhir-dari-berkas dalam string"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "akhir-dari-baris dalam string"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:332 src/xgettext.c:1003
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
 
-#: src/read-catalog.c:377
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "duplikasi definisi pesan"
 
-#: src/read-catalog.c:379
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "ini adalah lokasi dari definisi pertama"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "hilang nama penyaring"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "nilai nplurals tidak valid"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "berkas \"%s\" terpotong"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "berkas \"%s\" berisi bukan sebuah string berakhir NULL"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "berkas \"%s\" berisi bukan sebuah string berakhir NULL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "berkas \"%s\" bukan tidak berada dalam format GNU .mo"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "berkas \"%s\" berisi bukan string berakhir NULL, di %s"
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "peringatan: sintaks tidak valid \\uxxxx untuk karakter Unicode"
 
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: peringatan: surrogate U+%04X sendiri"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "peringatan: string tidak terselesaikan"
@@ -2779,7 +3677,7 @@ msgstr "peringatan: sintaks error"
 msgid "warning: unterminated key/value pair"
 msgstr "peringatan: pasangan kunci/nilai tidak terselesaikan"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr "peringatan: sintaks error, diduga ';' setelah string"
 
@@ -2787,7 +3685,7 @@ msgstr "peringatan: sintaks error, diduga ';' setelah string"
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "peringatan: sintaks error, diduga '=' atau ';' setelah string"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Ditulis oleh %s dan %s.\n"
@@ -2796,16 +3694,16 @@ msgstr "Ditulis oleh %s dan %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recode teks Serbian dari Cyrillic ke Latin script.\n"
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -2814,27 +3712,27 @@ msgstr ""
 "Teks masukan dibaca dari standar masukan. Teks terkonversi dikeluarkan ke\n"
 "standar keluaran.\n"
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "masukan tidak berada dalam pengkodean \"%s\" yang valid"
 
-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "diduga dua argumen"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Penggunaan: %s [PILIHAN] URL BERKAS\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2843,96 +3741,139 @@ msgstr ""
 "Ambil dan keluarkan isi dari sebuah URL. Jika URL tidak dapat diakses,\n"
 "BERKAS lokal yang dapat diakses akan digunakan.\n"
 
-#: src/urlget.c:234
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "error ketika membaca \"%s\""
+
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "error menulis stdout"
 
-#: src/urlget.c:264
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "error setelah membaca \"%s\""
+
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Mengambil %s..."
 
-#: src/urlget.c:307
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " waktu habis.\n"
 
-#: src/urlget.c:443
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " gagal.\n"
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Tidak dapat mengeluarkan terjemahan multiple domain kedalam sebuah berkas tunggal dengan format keluaran yang dispesifikasikan. Coba lebih baik gunakan sintaks berkas PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Tidak dapat mengeluarkan terjemahan multiple domain kedalam sebuah berkas "
+"tunggal dengan format keluaran yang dispesifikasikan. Coba lebih baik "
+"gunakan sintaks berkas PO."
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Tidak dapat mengeluarkan terjemahan multiple domain kedalam sebuah berkas tunggal dengan format keluaran yang dispesifikasikan."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Tidak dapat mengeluarkan terjemahan multiple domain kedalam sebuah berkas "
+"tunggal dengan format keluaran yang dispesifikasikan."
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "katalog pesan memiliki konteks tergantung terjemahan, tetapi format keluaran tidak mendukungnya."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"katalog pesan memiliki konteks tergantung terjemahan, tetapi format keluaran "
+"tidak mendukungnya."
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "pesan katalog memiliki bentuk terjemahan plural, tetapi format keluaran tidak mendukungnya. Coba buat sebuah class Java menggunakan \"msgfmt --java\", daripada dari sebuah properti berkas."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"pesan katalog memiliki bentuk terjemahan plural, tetapi format keluaran "
+"tidak mendukungnya. Coba buat sebuah class Java menggunakan \"msgfmt --java"
+"\", daripada dari sebuah properti berkas."
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "katalog pesan memiliki bentuk terjemahan plural, tetapi format keluaran tidak mendukungnya."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"katalog pesan memiliki bentuk terjemahan plural, tetapi format keluaran "
+"tidak mendukungnya."
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "tidak dapat membuat berkas output \"%s\""
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standard keluaran"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "gagal membuat direktori \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilasi dari kelas C# gagal, mohon coba --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: src/write-java.c:1080
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "error ketika membuka \"%s\" untuk ditulis"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "bukan sebuah nama kelas Java yang valid: %s"
 
-#: src/write-java.c:1165
+#: src/write-java.c:1216
 #, 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:1168
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "error ketika membuka \"%s\" untuk ditulis"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "urutan multibyte tidak valid"
 
-#: src/write-po.c:802
-#, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:1253 src/write-po.c:1382
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2941,11 +3882,12 @@ msgid ""
 "%s\n"
 msgstr ""
 "msgctxt berikut berisi karakter bukan-ASCII.\n"
-"Ini akan menyebabkan masalah ke penerjemah yang menggunakan karakter pengkodean\n"
+"Ini akan menyebabkan masalah ke penerjemah yang menggunakan karakter "
+"pengkodean\n"
 "berbeda dengan anda. Pertimbangkan menggunakan sebuah msgctxt ASCII murni.\n"
 "%s\n"
 
-#: src/write-po.c:1265 src/write-po.c:1394
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2954,11 +3896,12 @@ msgid ""
 "%s\n"
 msgstr ""
 "msgid berikut berisi karakter bukan-ASCII.\n"
-"Ini akan menyebabkan masalah ke penerjemah yang menggunakan karakter pengkodean\n"
+"Ini akan menyebabkan masalah ke penerjemah yang menggunakan karakter "
+"pengkodean\n"
 "berbeda dengan anda. Pertimbangkan menggunakan sebuah msgid ASCII murni.\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -2966,9 +3909,10 @@ msgstr ""
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format pesan katalog Qt tidak mendukung penanganan plural\n"
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
@@ -2976,7 +3920,7 @@ msgstr ""
 "tetapi format pesan katalog Qt hanya mendukung Unicode dalam string\n"
 "terjemahan, bukan dalam konteks string\n"
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -2986,12 +3930,12 @@ msgstr ""
 "tetapi format pesan katalog Qt hanya mendukung Unicode dalam string\n"
 "terjemahan, bukan dalam string belum diterjemahkan\n"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "error ketika menulis ke subproses %s"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -2999,7 +3943,7 @@ msgstr ""
 "katalog pesan memiliki konteks tergantung terjemahan\n"
 "tetapi format .resources C# tidak mendukung konteks\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3007,7 +3951,7 @@ msgstr ""
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format .resources C# tidak mendukung penanganan plural\n"
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3015,7 +3959,7 @@ msgstr ""
 "katalog pesan memiliki konteks tergantung terjemahan\n"
 "tetapi format pesan katalog Tcl tidak mendukung konteks\n"
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3023,27 +3967,52 @@ msgstr ""
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format katalog pesan Tcl tidak mendukung penanganan plural\n"
 
-#: src/x-awk.c:341 src/x-python.c:1074
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string tidak terselesaikan"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: ekspresi biasa tidak terselesaikan"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:224 src/xgettext.c:2020
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
 
@@ -3083,7 +4052,7 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
 "Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv gagal"
@@ -3097,234 +4066,142 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak valid.\n"
 "Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1281
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: peringatan: konstanta string tidak terselesaikan"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: peringatan: ')' ditemukan dimana '}' diduga"
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: peringatan: '}' ditemukan dimana ')' diduga"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
-
-#: 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"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
-"Bahasa \"glade\" tidak didukung. %s tergantung di expat.\n"
-"Versi ini dibuat tanpa expat.\n"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: peringatan: surrogate U+%04X sendiri"
-
-#: src/x-perl.c:308
-#, c-format
-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: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: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/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "bahasa `%s' tidak dikenal"
 
-#: src/x-perl.c:1183
+#: src/xgettext.c:646
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolasi tidak valid (\"\\u\") dari karakter 8bit \"%c\""
+msgid "sentence end type '%s' unknown"
+msgstr ""
 
-#: src/x-perl.c:1217
+#: src/xgettext.c:701
 #, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: variabel interpolasi tidak valid di \"%c\""
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/x-perl.c:1230
+#: src/xgettext.c:705
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/x-perl.c:1247
+#: src/xgettext.c:839
 #, 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-python.c:236
-msgid ""
-"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"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
-"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui sebuah komentar\n"
-"seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"%s:%d: Urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau melalui sebuah\n"
-"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:1027
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "Extract translatable strings from given input files.\n"
 msgstr ""
-"%s:%d: Urutan panjang multibyte tidak lengkap.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau melalui sebuah\n"
-"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
+"Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/x-python.c:312
+#: src/xgettext.c:1050
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
-"%s:%d: Urutan multibyte tidak lengkap diakhir dari berkas.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau melalui sebuah\n"
-"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
+"  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
+"messages.po)\n"
 
-#: src/x-python.c:322
+#: src/xgettext.c:1052
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
-"%s:%d: Urutan multibyte tidak lengkap di akhir dari baris.\n"
-"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau melalui sebuah\n"
-"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
+"  -o, --output=BERKAS         tulis keluaran ke berkas yang "
+"dispesifikasikan\n"
 
-#: src/x-python.c:355
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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"
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"%s:%d: Urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui sebuah komentar\n"
-"seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
-
-#: src/x-python.c:679
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
-
-#: src/x-rst.c:108
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: definisi string tidak valid"
+"  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
+"direktori DIR\n"
 
-#: src/x-rst.c:172
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: hilang angka setelah #"
-
-#: src/x-rst.c:207
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: ekspresi string tidak valid"
-
-#: src/x-sh.c:1074
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan keamanan; lebih baik gunakan eval_gettext"
-
-#: 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: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: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: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:843
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada messages.po)\n"
-
-#: 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:847
-#, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam direktori DIR\n"
-
-#: src/xgettext.c:852
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:854
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAMA         kenali bahasa yang dispesifikasikan\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:860
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3333,270 +4210,824 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:870
+#: src/xgettext.c:1078
 #, 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:875
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
+msgstr ""
+"  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-cooments=TAG   tempatkan blok komentar diawali dengan TAG dan\n"
-"                              baris kata kunci yang mengawalinya dalam berkas keluaran\n"
-"  -c, --add-cooments          tempatkan semua blok komentar sebelum baris kata kunci\n"
+"  -cTAG, --add-cooments=TAG   tempatkan blok komentar diawali dengan TAG "
+"dan\n"
+"                              baris kata kunci yang mengawalinya dalam "
+"berkas keluaran\n"
+"  -c, --add-cooments          tempatkan semua blok komentar sebelum baris "
+"kata kunci\n"
 "                              dalam berkas keluaran\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Pilihan spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:887
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:889 src/xgettext.c:896
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:893
-#, c-format
+#: src/xgettext.c:1113
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
-"  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
+"                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:903
-#, c-format
+#: src/xgettext.c:1121
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-"
+#| "source)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1126
 #, 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:909
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
+"BERKAS\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (hanya bahasa C++)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:923
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 lebih detil hasil pengenalan format string\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:948
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
+msgstr ""
+"      --properties-output     tulis keluar sebuah berkas .properties Java\n"
+
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/xgettext.c:963
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
+msgstr ""
+"      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:965
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk pengguna luar negri\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
+"pengguna luar negri\n"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:1192
 #, 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:969
+#: src/xgettext.c:1194
 #, 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:971
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
+"bugs\n"
 
-#: src/xgettext.c:973
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]  gunakan STRING atau \"\" sebagai awalan\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  gunakan STRING atau \"\" sebagai "
+"awalan\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:976
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRING], --msgstr-suffix[=STRING]  gunakan STRING atau \"\" sebagai akhiran\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  gunakan STRING atau \"\" sebagai "
+"akhiran\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:1782
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> sintaks: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
+"sintaks: %s"
 
-#: src/xgettext.c:1881
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1985
+#: src/xgettext.c:1872
+#, fuzzy
+#| msgid ""
+#| "The option --msgid-bugs-address was not specified.\n"
+#| "If you are using a `Makevars' file, please specify\n"
+#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+#| "specify an --msgid-bugs-address command line option.\n"
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Pilihan --msgid-bugs-address tidak dispesifikasikan.\n"
+"Jika anda menggunakan sebuah berkas `Makevars', mohon spesifikasikan\n"
+"variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
+"sebuah pilihan baris perintah --msgid-bugs-address.\n"
+
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "bahasa `%s' tidak dikenal"
+
+#: src/x-javascript.c:231
+#, fuzzy
+#| msgid "Please specify the source encoding through --from-code."
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
+
+#: src/x-javascript.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: urutan multibyte tidak valid.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
+
+#: src/x-javascript.c:291
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Urutan panjang multibyte tidak lengkap.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
+
+#: src/x-javascript.c:303
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak lengkap diakhir dari berkas.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
+
+#: src/x-javascript.c:312
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
+
+#: src/x-javascript.c:344
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak valid.\n"
+"Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
+
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: peringatan: string tidak terselesaikan"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Karakter bukan-ASCII di %s%s."
+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/xgettext.c:1989
+#: src/x-perl.c:1074
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: hilan kurung kanan di \\x{ANGKA HEKSA}"
 
-#: src/xgettext.c:1994
+#: src/x-perl.c:1195
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "String bukan-ASCII di %s%s."
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolasi tidak valid (\"\\l\") dari karakter 8bit \"%c\""
 
-#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
+#: src/x-perl.c:1215
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: peringatan: "
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolasi tidak valid (\"\\u\") dari karakter 8bit \"%c\""
 
-#: src/xgettext.c:2103
+#: src/x-perl.c:1249
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah format string %s valid. Karena: %s\n"
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: variabel interpolasi tidak valid di \"%c\""
 
-#: src/xgettext.c:2104
+#: src/x-perl.c:1262
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang valid. Karena: %s\n"
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
 
-#: src/xgettext.c:2135
+#: src/x-perl.c:1279
 #, 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-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"'%s' format string dengan argumen tidak bernama tidak dapat secara benar dilokalisasi:\n"
-"Penerjemah tidak dapat mengurutkan argumen.\n"
-"Mohon pertimbangkan menggunakan sebuah format string dengan argumen bernama,\n"
-"dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
+"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui "
+"sebuah komentar\n"
+"seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/xgettext.c:2197
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak valid.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau "
+"melalui sebuah\n"
+"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
+"html.\n"
+
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Urutan panjang multibyte tidak lengkap.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau "
+"melalui sebuah\n"
+"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
+"html.\n"
+
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak lengkap diakhir dari berkas.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau "
+"melalui sebuah\n"
+"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
+"html.\n"
+
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Urutan multibyte tidak lengkap di akhir dari baris.\n"
+"Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code atau "
+"melalui sebuah\n"
+"komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
+"html.\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"msgid kosong. Ini dijaga oleh GNU gettext:\n"
-"gettext(\"\") mengembalikan masukan header dengan\n"
-"informasi meta, bukan string kosong.\n"
+"%s:%d: Urutan multibyte tidak valid.\n"
+"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui "
+"sebuah komentar\n"
+"seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/xgettext.c:2834
+#: src/x-python.c:654
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
 
-#: src/xgettext.c:2861
+#: src/x-rst.c:116
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: definisi string tidak valid"
 
-#: src/xgettext.c:2886
+#: src/x-rst.c:180
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: hilang angka setelah #"
 
-#: src/xgettext.c:2907
+#: src/x-rst.c:215
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "konteks tidak cocok diantara bentuk singular dan plural"
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: ekspresi string tidak valid"
 
-#: src/xgettext.c:3016
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: definisi string tidak valid"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: definisi string tidak valid"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
-"Pilihan --msgid-bugs-address tidak dispesifikasikan.\n"
-"Jika anda menggunakan sebuah berkas `Makevars', mohon spesifikasikan\n"
-"variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
-"sebuah pilihan baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3226
+#: src/x-sh.c:1101
 #, c-format
-msgid "language `%s' unknown"
-msgstr "bahasa `%s' tidak dikenal"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
+"keamanan; lebih baik gunakan eval_gettext"
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "urutan kontrol tidak valid"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "bukan sebuah nama kelas Java yang valid: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "bukan sebuah nama kelas Java yang valid: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "urutan kontrol tidak valid"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "endianness tidak valid: %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "argumen %s tidak valid untuk %s"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "hilang nama penyaring"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: pilihan tidak diketahui '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: pilihan '-W %s' rancu\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "peringatan: header berkas PO fuzzy\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr ""
+#~ "peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error "
+#~ "disini\n"
+
+#, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "header field `%s' seharusnya dimulai di awal baris\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "beberapa field header masih memiliki nilai baku awal\n"
+
+#, c-format
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Bahasa \"glade\" tidak didukung. %s tergantung di expat.\n"
+#~ "Versi ini dibuat tanpa expat.\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Karakter bukan-ASCII di %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "String bukan-ASCII di %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: peringatan: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan "
+#~ "sebuah format string %s valid. Karena: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s "
+#~ "yang valid. Karena: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "'%s' format string dengan argumen tidak bernama tidak dapat secara benar "
+#~ "dilokalisasi:\n"
+#~ "Penerjemah tidak dapat mengurutkan argumen.\n"
+#~ "Mohon pertimbangkan menggunakan sebuah format string dengan argumen "
+#~ "bernama,\n"
+#~ "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
+
+#~ 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 ""
+#~ "msgid kosong. Ini dijaga oleh GNU gettext:\n"
+#~ "gettext(\"\") mengembalikan masukan header dengan\n"
+#~ "informasi meta, bukan string kosong.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "konteks tidak cocok diantara bentuk singular dan plural"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: pilihan tidak legal -- %c\n"
 
@@ -3606,29 +5037,20 @@ msgstr "<tidak bernama>"
 #~ msgid "Not yet implemented."
 #~ msgstr "Belum terimplementasi."
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
-
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "komunikasi dengan %s subproses gagal"
-
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "baca dari %s subproses gagal"
-
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "%s subproses berakhir dengan kode keluar %d"
-
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "field `%s' masih memiliki nilai baku awal\n"
 
 # )
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Hak Cipta (C) %s Free Software Foundation, Inc.\n"
-#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n"
+#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak "
+#~ "ada\n"
 #~ "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
 
 #~ msgid ""
@@ -3644,7 +5066,8 @@ msgstr "<tidak bernama>"
 #~ msgstr ""
 #~ "Pemakaian: %s [PILIHAN] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=TEXTDOMAIN   mengambil pesan terjemahan dari TEXTDOMAIN\n"
-#~ "  -e                        memungkinkan ekspansi beberapa escape sequence\n"
+#~ "  -e                        memungkinkan ekspansi beberapa escape "
+#~ "sequence\n"
 #~ "  -E                        (abaikan kompatibilitas)\n"
 #~ "  -h, --help                tampilkan bantuan ini dan keluar\n"
 #~ "  -n                        hilangkan newline yang mengekor\n"
@@ -3654,12 +5077,17 @@ msgstr "<tidak bernama>"
 
 #~ msgid ""
 #~ "\n"
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
@@ -3668,8 +5096,10 @@ msgstr "<tidak bernama>"
 #~ "variabel lingkungan TEXTDOMAIN. Jika katalog pesan tidak ditemukan dalam\n"
 #~ "direktori reguler, lokasi lain dapat dispesifikasikan dengan variabel \n"
 #~ "lingkungan TEXTDOMAINDIR.\n"
-#~ "Bila digunakan dengan pilihan -s program berlaku seperti perintah `echo'.\n"
-#~ "Tetapi ia tidak hanya menyalin argumennya ke stdout. Namun pesan tersebut\n"
+#~ "Bila digunakan dengan pilihan -s program berlaku seperti perintah "
+#~ "`echo'.\n"
+#~ "Tetapi ia tidak hanya menyalin argumennya ke stdout. Namun pesan "
+#~ "tersebut\n"
 #~ "diterjemahkan.\n"
 #~ "Direktori pencarian standar: %s\n"
 
@@ -3682,21 +5112,29 @@ msgstr "<tidak bernama>"
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Pemakaian: %s [PILIHAN] INPUTFILE ...\n"
-#~ "Argumen yang wajib untuk pilihan panjang juga wajib untuk pilihan pendek.\n"
-#~ " -d, --default-domain=NAME  gunakan NAME.po sebagai output (selain messages.po)\n"
-#~ " -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari file input\n"
+#~ "Argumen yang wajib untuk pilihan panjang juga wajib untuk pilihan "
+#~ "pendek.\n"
+#~ " -d, --default-domain=NAME  gunakan NAME.po sebagai output (selain "
+#~ "messages.po)\n"
+#~ " -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari file "
+#~ "input\n"
 #~ " -e, --no-escape            jangan gunakan escape C dalam output (baku)\n"
-#~ " -E, --escape               gunakan escape C dalam output, tanpa ekst. kar.\n"
+#~ " -E, --escape               gunakan escape C dalam output, tanpa ekst. "
+#~ "kar.\n"
 #~ " -f, --files-from=FILE      ambil daftar file input dari FILE\n"
 #~ "     --force-po             tulis file PO bahkan bila kosong\n"
 #~ " -F, --sort-by-file         sort output berdasar lokasi file\n"
@@ -3705,12 +5143,17 @@ msgstr "<tidak bernama>"
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
@@ -3721,8 +5164,10 @@ msgstr "<tidak bernama>"
 #~ "      --omit-header      jangan tulis header dengan masukan `msgid'\n"
 #~ "  -o, --output=FILE      tulis output ke file yang diberikan\n"
 #~ "  -p, --output-dir=DIR   file output akan diletakkan dalam direktori DIR\n"
-#~ "  -s, --sort-output      buat output dalam bentuk terurut dan hapus duplikat\n"
-#~ "      --strict           tulis file .po dalam bentuk Uniforum yang strict\n"
+#~ "  -s, --sort-output      buat output dalam bentuk terurut dan hapus "
+#~ "duplikat\n"
+#~ "      --strict           tulis file .po dalam bentuk Uniforum yang "
+#~ "strict\n"
 #~ "  -T, --trigraphs        kenali trigraph ANSI C sebagai input\n"
 #~ "  -u, --unique           singkatan untuk --less-than=2, minta\n"
 #~ "                         hanya pesan yang unik yang dicetak\n"
@@ -3732,12 +5177,16 @@ msgstr "<tidak bernama>"
 #~ "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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -3752,10 +5201,13 @@ msgstr "<tidak bernama>"
 #~ "Pemakaian: %s [PILIHAN] namafile.po ...\n"
 #~ "Membuat katalog pesan biner dari deskripsi terjemahan tekstual.\n"
 #~ "\n"
-#~ "Argumen yang perlu untuk pilihan panjang juga perlu untuk pilihan pendek.\n"
-#~ "  -a, --alignment=NUMBER     ratakan string menjadi NUMBER byte (baku %d)\n"
+#~ "Argumen yang perlu untuk pilihan panjang juga perlu untuk pilihan "
+#~ "pendek.\n"
+#~ "  -a, --alignment=NUMBER     ratakan string menjadi NUMBER byte (baku "
+#~ "%d)\n"
 #~ "  -c, --check                periksa ketergantungan bahasa pada string\n"
-#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari input file\n"
+#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari input "
+#~ "file\n"
 #~ "  -f, --use-fuzzy            gunakan masukkan fuzzy dalam output\n"
 #~ "  -h, --help                 tampilkan bantuan ini dan keluar\n"
 #~ "      --no-hash              file biner tidak akan mencakup tabel hash\n"
@@ -3779,7 +5231,8 @@ msgstr "<tidak bernama>"
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -e, --no-escape             do not use C escapes in output (default)\n"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
@@ -3787,17 +5240,21 @@ msgstr "<tidak bernama>"
 #~ "  -i, --indent                indented output style\n"
 #~ "  -o, --output-file=FILE      result will be written to FILE\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ "  -V, --version               output version information and exit\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
 #~ msgstr ""
 #~ "Pemakaian: %s [PILIHAN] def.po ref.po\n"
-#~ "Argumen yang perlu untuk pilihan panjang juga diperlukan untuk pilihan pendek.\n"
-#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari input file\n"
+#~ "Argumen yang perlu untuk pilihan panjang juga diperlukan untuk pilihan "
+#~ "pendek.\n"
+#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari input "
+#~ "file\n"
 #~ "  -e, --no-escape            jangan gunakan escape C dalam output (baku)\n"
-#~ "  -E, --escape               gunakan escape C dalam output, tanpa ekst. kar.\n"
+#~ "  -E, --escape               gunakan escape C dalam output, tanpa ekst. "
+#~ "kar.\n"
 #~ "      --force-po             tulis file PO bahkan bila kosong\n"
 #~ "  -h, --help                 tampilkan bantuan ini dan keluar\n"
 #~ "  -i, --indent               gaya output terindentasi\n"
@@ -3817,7 +5274,8 @@ msgstr "<tidak bernama>"
 #~ "      --force-po           write PO file even if empty\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
@@ -3825,7 +5283,8 @@ msgstr "<tidak bernama>"
 #~ "Pemakaian: %s [PILIHAN] [FILE]...\n"
 #~ "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek.\n"
 #~ "  -e, --no-escape         jangan gunakan escape C dalam output (baku)\n"
-#~ "  -E, --escape            gunakan escape C dalam output, tanpa ekst. karakter\n"
+#~ "  -E, --escape            gunakan escape C dalam output, tanpa ekst. "
+#~ "karakter\n"
 #~ "      --force-po          tulis file PO bahkan bila kosong\n"
 #~ "  -h, --help              tampilkan bantuan ini dan keluar\n"
 #~ "  -i, --indent            tulis output bergaya indentasi\n"
@@ -3859,14 +5318,20 @@ msgstr "<tidak bernama>"
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Pemakaian: %s [PILIHAN] INPUTFILE ...\n"
@@ -3874,53 +5339,73 @@ msgstr "<tidak bernama>"
 #~ "\n"
 #~ "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek.\n"
 #~ "  -a, --extract-all          ekstraksi seluruh string\n"
-#~ "  -c, --add-comment[=TAG]    letakkan blok komentar dengan TAG (atau baris \n"
+#~ "  -c, --add-comment[=TAG]    letakkan blok komentar dengan TAG (atau "
+#~ "baris \n"
 #~ "                             kata kunci sebelumnya) dalam file output\n"
 #~ "  -C, --c++                  singkatan untuk --language=C++\n"
-#~ "      --debug                hasil pengenalan formatstring yang lebih detil\n"
+#~ "      --debug                hasil pengenalan formatstring yang lebih "
+#~ "detil\n"
 #~ "  -d, --default-domain=NAME  gunakan NAME.po sebagai output\n"
-#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari file input\n"
+#~ "  -D, --directory=DIRECTORY  tambah DIRECTORY ke daftar untuk cari file "
+#~ "input\n"
 #~ "  -e, --no-escape            jangan gunakan escape C dalam output (baku)\n"
-#~ "  -E, --escape               gunakan escape C dalam output, tanpa ekst. kar.\n"
+#~ "  -E, --escape               gunakan escape C dalam output, tanpa ekst. "
+#~ "kar.\n"
 #~ "  -f, --files-from=FILE      ambil daftar input file dari FILE\n"
 #~ "      --force-po             tulis file PO bahkan bila kosong\n"
-#~ "      --foreign-user         hilangkan copyright FSF dalam output untuk user asing\n"
+#~ "      --foreign-user         hilangkan copyright FSF dalam output untuk "
+#~ "user asing\n"
 #~ "  -F, --sort-by-file         urutkan output berdasar lokasi file\n"
 
 #~ msgid ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
+#~ "instead %u\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ " -h, --help                    tampilkan bantuan ini dan keluar\n"
 #~ " -i, --indent                  tulis file .po dengan gaya terindentasi\n"
 #~ " -j, --join-existing           gabung pesan dengan file yang telah ada\n"
-#~ " -k, --keyword[=WORD]          keyword tambahan untuk dicari (tanpa WORD \n"
+#~ " -k, --keyword[=WORD]          keyword tambahan untuk dicari (tanpa "
+#~ "WORD \n"
 #~ "                               berarti tidak menggunakan keyword baku)\n"
 #~ " -l,--string-limit=NUMBER      set batasan string ke NUMBER bukan %u\n"
-#~ " -L,--language=NAME            kenali bahasa tertentu (C, C++, PO), selain itu \n"
+#~ " -L,--language=NAME            kenali bahasa tertentu (C, C++, PO), "
+#~ "selain itu \n"
 #~ "                               duga dari ekstensi file\n"
-#~ " -m, --msgstr-prefix[=STRING]  gunakan STRING atau \"\\\" sebagai prefix untuk\n"
+#~ " -m, --msgstr-prefix[=STRING]  gunakan STRING atau \"\\\" sebagai prefix "
+#~ "untuk\n"
 #~ "                               masukan msgstr\n"
-#~ " -M, --msgstr-suffix[=STRING]  gunakan STRING atau \"\\\" sebagai suffix untuk\n"
+#~ " -M, --msgstr-suffix[=STRING]  gunakan STRING atau \"\\\" sebagai suffix "
+#~ "untuk\n"
 #~ "                               masukan msgstr\n"
 #~ "     --no-location             jangan gunakan baris '#: filename:line'\n"
 
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index a76ffd117..df891a577 100644
--- a/gettext-tools/po/it.po
+++ b/gettext-tools/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2015-08-05 15:28+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,26 +16,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argomento %s non valido per %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argomento %s ambiguo per %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Sono argomenti validi:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
+msgstr ""
+"impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:339
 #, c-format
@@ -56,201 +58,185 @@ msgstr "impossibile rimuovere la directory temporanea \"%s\""
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "permessi mantenuti per %s"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "errore durante l'apertura di \"%s\" in lettura"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, 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:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "errore durante la lettura di \"%s\""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "errore durante la scrittura di \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, 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:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232 src/msginit.c:1397
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() non riuscito"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Compilatore C# non trovato, provare a installare pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Macchina virtuale C# non trovata, provare a installare pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "sottoprocesso %s non riuscito"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione \"%s\" è ambigua; scelte:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: l'opzione \"%s\" è ambigua\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: l'opzione \"%s\" è ambigua; scelte:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opzione \"--%s\" non riconosciuta\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opzione non valida -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l'opzione richiede un argomento -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argomento source_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argomento target_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "creazione di \"%s\" non riuscita"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-java.c:1157 src/write-java.c:1198
-#: src/write-mo.c:812 src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Compilatore Java non trovato, provare a installare gcj o impostare $JAVAC"
+msgstr ""
+"Compilatore Java non trovato, provare a installare gcj o impostare $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Macchina virtuale Java non trovata, provare a installare gij o a impostare $JAVA"
+msgstr ""
+"Macchina virtuale Java non trovata, provare a installare gij o a impostare "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141 src/msginit.c:1405
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "errore di I/O nel sottoprocesso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/format-kde-kuit.c:239 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 src/x-glade.c:549
-#: libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "creazione di thread non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrittura sul sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lettura dal sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "impossibile impostare un I/O non bloccante per il sottoprocesso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "comunicazione col sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "sottoprocesso %s terminato con codice d'uscita %d"
@@ -274,13 +260,13 @@ msgstr "sottoprocesso %s terminato con codice d'uscita %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "\""
 
@@ -289,129 +275,311 @@ msgstr "\""
 msgid "setting permissions for %s"
 msgstr "impostazione permessi per %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "impossibile creare la pipe"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle non riuscito"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "impossibile ripristinare il fd %d: dup2 non riuscito"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "sottoprocesso %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "il sottoprocesso %s ha ricevuto il segnale fatale %d"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217 src/xgettext.c:2036
-#: src/xgettext.c:2049 src/xgettext.c:2059
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "errore durante l'apertura di \"%s\" in lettura"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:152
+#: src/cldr-plurals.c:69
 #, 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 \"%s\". Motivo: %s"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, fuzzy, c-format
+#| msgid "The root element <%s> is not allowed in a valid Glade file"
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "L'elemento radice <%s> non è ammesso in un file di Glade valido"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "una specifica di formato per l'argomento %u, come in \"%s\", non esiste in \"%s\""
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Uso: %s [OPZIONE] [FILE]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
+"Similmente per gli argomenti opzionali.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licenza GPLv3+: GNU GPL versione 3 o superiore <http://gnu.org/licenses/gpl.html>\n"
+"\n"
+"Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
+"NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Scritto da %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, fuzzy, c-format
+#| msgid "%s exists but cannot read"
+msgid "%s cannot be read"
+msgstr "%s esiste ma non può essere letto"
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "impossibile rimuovere la directory temporanea \"%s\""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "errore durante l'apertura di \"%s\" in lettura"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgstr ""
+"una specifica di formato per l'argomento %u, come in \"%s\", non esiste in "
+"\"%s\""
+
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 specifica di formato per l'argomento %u non esiste in \"%s\""
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "le specifiche di formato in \"%s\" e \"%s\" per l'argomento %u non corrispondono"
+msgstr ""
+"le specifiche di formato in \"%s\" e \"%s\" per l'argomento %u non "
+"corrispondono"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "La direttiva numero %u comincia con \"|\" ma non termina con \"|\"."
 
-#: src/format-c.c:37
+#: src/format.c:152
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Nella direttiva numero %u, il termine dopo \"<\" non è il nome di una macro di specificazione di formato. I nomi di macro validi sono elencati nella sezione 7.8.1 dell'ISO C 99."
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"\"%s\" non è una stringa di formato %s valida, diversamente da \"%s\". "
+"Motivo: %s"
+
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Nella direttiva numero %u, il termine dopo \"<\" non è il nome di una macro "
+"di specificazione di formato. I nomi di macro validi sono elencati nella "
+"sezione 7.8.1 dell'ISO C 99."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Nella direttiva numero %u, il termine dopo \"<\" non è seguito da \">\"."
+msgstr ""
+"Nella direttiva numero %u, il termine dopo \"<\" non è seguito da \">\"."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "La stringa fa riferimento all'argomento numero %u ma ignora l'argomento numero %u."
+msgstr ""
+"La stringa fa riferimento all'argomento numero %u ma ignora l'argomento "
+"numero %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "il numero di specifiche di formato in \"%s\" e \"%s\" non corrisponde"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Nella direttiva numero %u, \"{\" non è seguita da un numero di argomento."
+msgstr ""
+"Nella direttiva numero %u, \"{\" non è seguita da un numero di argomento."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Nella direttiva numero %u, \",\" non è seguita da un numero."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "La stringa termina nel mezzo di una direttiva: trovata \"{\" senza la \"}\" corrispondente."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"La stringa termina nel mezzo di una direttiva: trovata \"{\" senza la \"}\" "
+"corrispondente."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "La direttiva numero %u termina con il carattere non valido \"%c\" invece di \"}\"."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"La direttiva numero %u termina con il carattere non valido \"%c\" invece di "
+"\"}\"."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "La direttiva numero %u termina con un carattere non valido invece di \"}\"."
+msgstr ""
+"La direttiva numero %u termina con un carattere non valido invece di \"}\"."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "La stringa inizia nel mezzo di una direttiva: trovata \"}\" senza la \"{\" corrispondente."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"La stringa inizia nel mezzo di una direttiva: trovata \"}\" senza la \"{\" "
+"corrispondente."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La stringa contiene una \"}\" solitaria dopo la direttiva numero %u."
@@ -424,22 +592,31 @@ msgstr "Nella direttiva numero %u, la combinazione delle opzioni non è valida."
 #: 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\"."
+msgstr ""
+"Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
 #: 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 "Nella direttiva numero %u, il numero di argomento per la precisione deve essere uguale a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Nella direttiva numero %u, il numero di argomento per la precisione deve "
+"essere uguale a %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
 #: 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."
+msgstr ""
+"Nella direttiva numero %u, la specificazione di precisione non è valida."
 
 #: src/format-gcc-internal.c:463
 #, c-format
@@ -471,95 +648,147 @@ msgid "The string ends in the middle of a directive."
 msgstr "La stringa termina nel mezzo di una direttiva."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "La stringa fa riferimento ad argomenti attraverso specificazioni di argomenti sia con numero che senza numero."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"La stringa fa riferimento ad argomenti attraverso specificazioni di "
+"argomenti sia con numero che senza numero."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "Nella direttiva numero %u, l'argomento numero 0 non è un intero positivo."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"Nella direttiva numero %u, l'argomento numero 0 non è un intero positivo."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Nella direttiva numero %u, la larghezza dell'argomento numero 0 non è un intero positivo."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Nella direttiva numero %u, la larghezza dell'argomento numero 0 non è un "
+"intero positivo."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Nella direttiva numero %u, la precisione dell'argomento numero 0 non è un intero positivo."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Nella direttiva numero %u, la precisione dell'argomento numero 0 non è un "
+"intero positivo."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "Nella direttiva numero %u, il carattere \"%c\" non è uno specificatore di conversione valido."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"Nella direttiva numero %u, il carattere \"%c\" non è uno specificatore di "
+"conversione valido."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Il carattere che termina la direttiva numero %u non è uno specificatore di conversione valido."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Il carattere che termina la direttiva numero %u non è uno specificatore di "
+"conversione valido."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "La stringa fa riferimento all'argomento numero %u in modi incompatibili."
+msgstr ""
+"La stringa fa riferimento all'argomento numero %u in modi incompatibili."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "Nella direttiva numero %u, la sottostringa \"%s\" non è uno stile di data/ora valido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"Nella direttiva numero %u, la sottostringa \"%s\" non è uno stile di data/"
+"ora valido."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Nella direttiva numero %u, \"%s\" non è seguito da una virgola."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Nella direttiva numero %u, la sottostringa \"%s\" non è uno stile di numero valido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Nella direttiva numero %u, la sottostringa \"%s\" non è uno stile di numero "
+"valido."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Nella direttiva numero %u, il numero di argomento non è seguito da una virgola e da uno tra \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Nella direttiva numero %u, il numero di argomento non è seguito da una "
+"virgola e da uno tra \"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Nella direttiva numero %u, una scelta non contiene alcun numero."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Nella direttiva numero %u, una scelta contiene un numero non seguito da \"<\", \"#\" o \"%s\"."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Nella direttiva numero %u, una scelta contiene un numero non seguito da \"<"
+"\", \"#\" o \"%s\"."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "una specifica di formato per l'argomento {%u}, come in \"%s\", non esiste in \"%s\""
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"una specifica di formato per l'argomento {%u}, come in \"%s\", non esiste in "
+"\"%s\""
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "una specifica di formato per l'argomento {%u}, non esiste in \"%s\""
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "le specifiche di formato in \"%s\" e \"%s\" per l'argomento {%u} non corrispondono"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"le specifiche di formato in \"%s\" e \"%s\" per l'argomento {%u} non "
+"corrispondono"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "La stringa fa riferimento all'argomento numero %u ma ignora gli argomenti numero %u e %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"La stringa fa riferimento all'argomento numero %u ma ignora gli argomenti "
+"numero %u e %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "una specifica di formato per gli argomenti %u e %u non esiste in \"%s\", solo un argomento può essere ignorato"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"una specifica di formato per gli argomenti %u e %u non esiste in \"%s\", "
+"solo un argomento può essere ignorato"
 
-#: src/format-kde-kuit.c:251 src/format-kde-kuit.c:261
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
 msgid "error while parsing: %s"
 msgstr "errore durante il parsing: %s"
@@ -567,15 +796,27 @@ msgstr "errore durante il parsing: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Nella direttiva numero %u, il parametro %u è di tipo \"%s\", ma è atteso un parametro di tipo \"%s\""
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Nella direttiva numero %u, il parametro %u è di tipo \"%s\", ma è atteso un "
+"parametro di tipo \"%s\""
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Nella direttiva numero %u, sono stati indicati troppi parametri; previsto %u parametro al massimo."
-msgstr[1] "Nella direttiva numero %u, sono stati indicati troppi parametri; previsti %u parametri al massimo."
+msgid ""
+"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."
+msgstr[0] ""
+"Nella direttiva numero %u, sono stati indicati troppi parametri; previsto %u "
+"parametro al massimo."
+msgstr[1] ""
+"Nella direttiva numero %u, sono stati indicati troppi parametri; previsti %u "
+"parametri al massimo."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -601,12 +842,18 @@ msgstr "Trovato \"~%c\" senza il corrispondente \"~%c\"."
 #: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Nella direttiva numero %u, entrambi i modificatori \"@\" e \":\" sono stati indicati."
+msgstr ""
+"Nella direttiva numero %u, entrambi i modificatori \"@\" e \":\" sono stati "
+"indicati."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Nella direttiva numero %u, \"~:[\" non è seguito da due espressioni, separate da \"~;\"."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Nella direttiva numero %u, \"~:[\" non è seguito da due espressioni, "
+"separate da \"~;\"."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -625,255 +872,301 @@ msgstr "le specifiche di formato in \"%s\" e \"%s\" non sono equivalenti"
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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 \"%s\""
-
-#: src/format-perl.c:434
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Nella direttiva %u, lo specificatore di dimensione è incompatibile con lo specificatore di conversione \"%c\"."
+msgstr ""
+"le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in \"%s"
+"\""
 
-#: src/format-perl-brace.c:199 src/format-python.c:472
-#: src/format-python-brace.c:435 src/format-python-brace.c:448
-#: src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "La stringa fa riferimento ad argomenti attraverso specificazioni di argomenti sia con nome che senza nome."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Nella direttiva %u, lo specificatore di dimensione è incompatibile con lo "
+"specificatore di conversione \"%c\"."
 
-#: src/format-python.c:355
+#: src/format-python-brace.c:138
 #, 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."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+"Nella direttiva numero %u, \"%c\" non può iniziare il nome di un campo."
 
-#: src/format-python.c:431
+#: src/format-python-brace.c:157
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "le specifiche di formato in \"%s\" prevedono una mappatura, quelle in \"%s\" prevedono una tupla"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"Nella direttiva numero %u, \"%c\" non è seguito da un argomento di getattr."
 
-#: src/format-python.c:438
+#: src/format-python-brace.c:171
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "le specifiche di formato in \"%s\" prevedono una tupla, quelle in \"%s\" prevedono una mappatura"
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+"Nella direttiva numero %u, \"%c\" non può iniziare un parametro di gettitem."
 
-#: src/format-python.c:461 src/format-sh.c:298
+# FIXME: nesting?
+#: src/format-python-brace.c:193
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "una specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste in \"%s\""
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Nella direttiva numero %u, non è ammesso ulteriore nesting nel formato di "
+"specificazione."
 
-#: src/format-python.c:495
+#: src/format-python-brace.c:278
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "le specifiche di formato in \"%s\" e \"%s\" per l'argomento \"%s\" non corrispondono"
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Nella direttiva numero %u, c'è una direttiva di formato non terminata."
 
-#: src/format-python-brace.c:138
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"La stringa fa riferimento ad argomenti attraverso specificazioni di "
+"argomenti sia con nome che senza nome."
+
+#: src/format-python.c:354
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Nella direttiva numero %u, \"%c\" non può iniziare il nome di un campo."
+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-brace.c:151
+#: src/format-python.c:430
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "Nella direttiva numero %u, \"%c\" non è seguito da un argomento di getattr."
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"le specifiche di formato in \"%s\" prevedono una mappatura, quelle in \"%s\" "
+"prevedono una tupla"
 
-#: src/format-python-brace.c:166
+#: src/format-python.c:437
 #, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Nella direttiva numero %u, \"%c\" non può iniziare un parametro di gettitem."
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"le specifiche di formato in \"%s\" prevedono una tupla, quelle in \"%s\" "
+"prevedono una mappatura"
 
-# FIXME: nesting?
-#: src/format-python-brace.c:186
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "Nella direttiva numero %u, non è ammesso ulteriore nesting nel formato di specificazione."
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"una specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
+"in \"%s\""
 
-#: src/format-python-brace.c:271
+#: src/format-python.c:494
 #, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Nella direttiva numero %u, c'è una direttiva di formato non terminata."
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"le specifiche di formato in \"%s\" e \"%s\" per l'argomento \"%s\" non "
+"corrispondono"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "\"%s\" è una stringa di formato semplice, ma \"%s\" non lo è: contiene una flag 'L' o un argomento numerico a due cifre"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"\"%s\" è una stringa di formato semplice, ma \"%s\" non lo è: contiene una "
+"flag 'L' o un argomento numerico a due cifre"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "La stringa fa riferimento a una variabile della shell con un nome non ASCII."
+msgstr ""
+"La stringa fa riferimento a una variabile della shell con un nome non ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "La stringa fa riferimento a una variabile della shell con una sintassi {} complessa. Per motivi di sicurezza, questa sintassi non è gestita."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"La stringa fa riferimento a una variabile della shell con una sintassi {} "
+"complessa. Per motivi di sicurezza, questa sintassi non è gestita."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "La stringa fa riferimento a una variabile della shell il cui valore può essere diverso all'interno di una funzione della shell."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"La stringa fa riferimento a una variabile della shell il cui valore può "
+"essere diverso all'interno di una funzione della shell."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "La stringa fa riferimento a una variabile della shell senza nome."
 
-#: src/format-ycp.c:91
-#, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "Nella direttiva numero %u, il carattere \"%c\" non è una cifra tra 1 e 9."
-
-#: src/format-ycp.c:92
+#: src/format-ycp.c:90
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Il carattere che termina la direttiva numero %u  non è una cifra tra 1 e 9."
-
-#: src/hostname.c:181 src/msgattrib.c:356 src/msgcat.c:295 src/msgcmp.c:173
-#: src/msgcomm.c:286 src/msgconv.c:245 src/msgen.c:242 src/msgexec.c:187
-#: src/msgfilter.c:289 src/msgfmt.c:417 src/msggrep.c:420 src/msginit.c:269
-#: src/msgmerge.c:357 src/msgunfmt.c:263 src/msguniq.c:265
-#: src/recode-sr-latin.c:111 src/urlget.c:144 src/xgettext.c:646
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Licenza GPLv3+: GNU GPL versione 3 o superiore <http://gnu.org/licenses/gpl.html>\n"
-"\n"
-"Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
-"NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
+"Nella direttiva numero %u, il carattere \"%c\" non è una cifra tra 1 e 9."
 
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgcmp.c:179
-#: src/msgcomm.c:292 src/msgconv.c:251 src/msgen.c:248 src/msgexec.c:193
-#: src/msgfilter.c:295 src/msgfmt.c:423 src/msggrep.c:426 src/msginit.c:275
-#: src/msgmerge.c:363 src/msgunfmt.c:269 src/msguniq.c:271 src/urlget.c:150
-#: src/xgettext.c:652
+#: src/format-ycp.c:91
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Scritto da %s.\n"
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Il carattere che termina la direttiva numero %u  non è una cifra tra 1 e 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: src/hostname.c:210 src/msgattrib.c:418 src/msgcat.c:364 src/msgcmp.c:210
-#: src/msgcomm.c:356 src/msgconv.c:304 src/msgen.c:301 src/msgexec.c:260
-#: src/msgfilter.c:410 src/msgfmt.c:771 src/msggrep.c:513 src/msginit.c:359
-#: src/msgmerge.c:495 src/msgunfmt.c:424 src/msguniq.c:323
-#: src/recode-sr-latin.c:144 src/urlget.c:173 src/xgettext.c:900
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
-
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uso: %s [OPZIONE]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Stampa il nome dell'host.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato dell'output:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nome corto dell'host\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          nome lungo dell'host, incluso il nome di dominio\n"
+"  -f, --fqdn, --long          nome lungo dell'host, incluso il nome di "
+"dominio\n"
 "                                completo e gli alias\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            indirizzi per il nome dell'host\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:917 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1080
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
 
-#: src/hostname.c:233 src/msgattrib.c:537 src/msgcat.c:472 src/msgcmp.c:261
-#: src/msgcomm.c:458 src/msgconv.c:388 src/msgen.c:384 src/msgexec.c:309
-#: src/msgfilter.c:510 src/msgfmt.c:919 src/msggrep.c:631 src/msginit.c:423
-#: src/msgmerge.c:622 src/msgunfmt.c:530 src/msguniq.c:420
-#: src/recode-sr-latin.c:165 src/urlget.c:189 src/xgettext.c:1082
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "impossibile ottenere il nome dell'host"
 
-#: src/hostname.c:235 src/msgattrib.c:539 src/msgcat.c:474 src/msgcmp.c:263
-#: src/msgcomm.c:460 src/msgconv.c:390 src/msgen.c:386 src/msgexec.c:311
-#: src/msgfilter.c:512 src/msgfmt.c:921 src/msggrep.c:633 src/msginit.c:425
-#: src/msgmerge.c:624 src/msgunfmt.c:532 src/msguniq.c:422
-#: src/recode-sr-latin.c:168 src/urlget.c:191 src/xgettext.c:1084
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "devono essere specificati almeno due file"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:242 src/msgattrib.c:546 src/msgcat.c:481 src/msgcmp.c:270
-#: src/msgcomm.c:467 src/msgconv.c:397 src/msgen.c:393 src/msgexec.c:318
-#: src/msgfilter.c:519 src/msgfmt.c:932 src/msggrep.c:640 src/msginit.c:432
-#: src/msgmerge.c:635 src/msgunfmt.c:541 src/msguniq.c:429
-#: src/recode-sr-latin.c:175 src/urlget.c:200 src/xgettext.c:1091
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "impossibile creare la pipe"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "impossibile ottenere il nome dell'host"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "argomento %s non valido per %s"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "impossibile creare la pipe"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, fuzzy, c-format
+#| msgid "%s does not exist"
+msgid "\"%s\" node does not have \"%s\""
+msgstr "%s non esiste"
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "impossibile creare il file di output \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "è permesso al massimo un file di input"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:471 src/msgfmt.c:479
-#: src/msgfmt.c:494 src/msgfmt.c:516 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:662 src/xgettext.c:669 src/xgettext.c:672
-#: src/xgettext.c:675
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -882,61 +1175,68 @@ msgstr ""
 "Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
 "e manipola gli attributi.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
+"corte.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:789 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:918
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Posizione del file di input:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FILEINPUT                   file PO di input\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:793 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:924
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=DIRECTORY   aggiunge DIRECTORY all'elenco di ricerca dei file\n"
+"  -D, --directory=DIRECTORY   aggiunge DIRECTORY all'elenco di ricerca dei "
+"file\n"
 "                              di input\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:815 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:929
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Posizione del file di output:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:817 src/msgfmt.c:866
-#: src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492 src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -945,265 +1245,308 @@ msgstr ""
 "I risultati vengono scritti su standard output quando nessun file di output\n"
 "è specificato o è -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selezione dei messaggi:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            mantiene i messaggi tradotti, rimuove i messaggi\n"
+"      --translated            mantiene i messaggi tradotti, rimuove i "
+"messaggi\n"
 "                              non tradotti\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          mantiene i messaggi non tradotti, rimuove i\n"
 "                              messaggi tradotti\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
+msgstr ""
+"      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            mantiene i messaggi marcati come \"fuzzy\"\n"
+msgstr ""
+"      --only-fuzzy            mantiene i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           rimuove i messaggi  #~ obsoleti\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene i messaggi #~ obsoleti\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipolazione degli attributi:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             rende \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           rende non \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          rende obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        rende non obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              quando si imposta \"fuzzy\", mantiene i precedenti\n"
+"      --previous              quando si imposta \"fuzzy\", mantiene i "
+"precedenti\n"
 "                              msgid dei messaggi tradotti\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        elimina i \"previous msgid\" da tutti i messaggi\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        elimina i \"previous msgid\" da tutti i "
+"messaggi\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 quando rimuove i \"fuzzy\", svuota i msgstr\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 quando rimuove i \"fuzzy\", svuota i msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, 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"
+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:485
+#: src/msgattrib.c:484
 #, 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"
+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:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinonimo di --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              sinonimo di --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              sinonimo di --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:879 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintassi del file di input:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      il file di input usa la sintassi Java .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      il file di input usa la sintassi Java ."
+"properties\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
-"      --stringtable-input     il file di input usa la sintassi NeXTstep/GNUstep\n"
+"      --stringtable-input     il file di input usa la sintassi NeXTstep/"
+"GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:907 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1026
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Dettagli di output:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1028
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"                              QUANDO può essere 'always', 'never', 'auto', o "
+"'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1032
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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"
+msgstr ""
+"      --style=FILESTILE       specifica il file di stile CSS per --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1034
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             non usa gli escape del C nell'output (predefinito)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             non usa gli escape del C nell'output "
+"(predefinito)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1036
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                usa gli escape del C nell'output, nessun carattere\n"
+"  -E, --escape                usa gli escape del C nell'output, nessun "
+"carattere\n"
 "                              esteso\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1038
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1040
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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"
+msgstr ""
+"  -i, --indent                scrive il file .po usando lo stile indentato\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1042
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           non scrive le righe \"#: nomefile:riga\"\n"
+msgstr ""
+"      --no-location           non scrive le righe \"#: nomefile:riga\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1044
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          genera le righe \"#: nomefile:riga\" (predefinito)\n"
+"  -n, --add-location          genera le righe \"#: nomefile:riga"
+"\" (predefinito)\n"
 "\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1046
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                genera un file .po in formato Uniforum strict\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                genera un file .po in formato Uniforum strict\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1050
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    genera un file NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    genera un file NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1052
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          imposta la larghezza della pagina\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1054
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               non manda a capo le righe dei messaggi più lunghe\n"
+"      --no-wrap               non manda a capo le righe dei messaggi più "
+"lunghe\n"
 "                              della larghezza della pagina\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1057
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera un output ordinato\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1059
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          ordina l'output in base alla posizione del file\n"
+msgstr ""
+"  -F, --sort-by-file          ordina l'output in base alla posizione del "
+"file\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:904
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1226,23 +1569,24 @@ msgstr ""
 "meno che sia specificata l'opzione --use-first, nel qual caso vengono usati\n"
 "solo quelli nel primo file PO.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:920
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FILEINPUT ...               file di input\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:922
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:795
-#: src/xgettext.c:926
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:409 src/msgcomm.c:400
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1251,46 +1595,52 @@ msgstr ""
 "  -<, --less-than=NUMERO      stampa i messaggi with con meno di NUMERO\n"
 "                              definizioni, è predefinito a 1\n"
 
-#: src/msgcat.c:412
+#: 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 ""
-"  ->, --more-than=NUMERO      stampa i messaggi con più di NUMERO definizioni,\n"
+"  ->, --more-than=NUMERO      stampa i messaggi con più di NUMERO "
+"definizioni,\n"
 "                              è predefinito a 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: 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 ""
-"  -u, --unique                abbreviazione di --less-than=2, solo i messaggi\n"
+"  -u, --unique                abbreviazione di --less-than=2, solo i "
+"messaggi\n"
 "                              unici vengono stampati\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:881
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      i file di input usano la sintassi Java .properties\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      i file di input usano la sintassi Java ."
+"properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:883
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     i file di input usano la sintassi NeXTstep/GNUstep\n"
+"      --stringtable-input     i file di input usano la sintassi NeXTstep/"
+"GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codifica dell'output\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1299,32 +1649,34 @@ msgstr ""
 "      --use-first             usa la prima traduzione disponibile per ogni\n"
 "                              messaggio, non unisce diverse traduzioni\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NOMECATALOGO     imposta il campo 'Language' nell'intestazione\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=NOMECATALOGO     imposta il campo 'Language' nell'intestazione\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "non sono specificati file d'ingresso"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sono richiesti esattamente 2 file d'ingresso"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uso: %s [OPZIONE] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1342,85 +1694,89 @@ msgstr ""
 "programma. Quando non è possibile trovare una corrispondenza esatta, sono usate\n"
 "le corrispondenze approssimative (fuzzy) per produrre diagnostiche migliori.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduzioni\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     riferimenti alle fonti\n"
 
 # FIXME
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori di operazione:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          applica ref.pot a ciascuno dei domini in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          applica ref.pot a ciascuno dei domini in def."
+"po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             considera le voci fuzzy\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      considera le voci non tradotte\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "questo messaggio non è tradotto"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "questo messaggio è usato ma non definito..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ma questa definizione è simile"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "questo messaggio è usato ma non è definito in %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:554 src/msgfmt.c:653 src/msgfmt.c:1444 src/xgettext.c:883
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:317
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "devono essere specificati almeno due file"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1440,76 +1796,83 @@ 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:403
+#: 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 ""
-"  ->, --more-than=NUMERO      stampa i messaggi con più di NUMERO definizioni,\n"
+"  ->, --more-than=NUMERO      stampa i messaggi con più di NUMERO "
+"definizioni,\n"
 "                              è predefinito a 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1061
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           non scrive l'intestazione con la voce 'msgid \"\"'\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           non scrive l'intestazione con la voce 'msgid "
+"\"\"'\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Obiettivo di conversione:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                stile di output indentato\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           sopprime le righe \"#: nomefile:riga\"\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          preserva le righe \"#: nomefile:riga\" (predefinito)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          preserva le righe \"#: nomefile:riga"
+"\" (predefinito)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                stile di output Uniforum strict\n"
 
-#: src/msgen.c:259 src/msgfmt.c:434 src/xgettext.c:692
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "non è specificato nessun file d'ingresso"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "è richiesto esattamente un file d'ingresso"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uso: %s [OPZIONE] FILEINPUT\n"
 
 # FIXME
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1522,22 +1885,22 @@ msgstr ""
 "xgettext). Alle voci non tradotte è fornita una traduzione identica\n"
 "al msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FILEINPUT                   file PO o POT di input\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "nome di comando mancante"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] COMANDO [OPZIONE-COMANDO]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1552,7 +1915,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1561,47 +1924,49 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Comandi di input:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   aggiungi una newline alla fine dell'input\n"
+msgstr ""
+"  --newline                   aggiungi una newline alla fine dell'input\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FILEINPUT       file PO di input\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "scrittura su standard output non riuscita"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "nome di filtro mancante"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "deve essere specificato almeno uno script sed"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1610,12 +1975,12 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Filtri di input e output:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1624,247 +1989,287 @@ msgstr ""
 "  --newline                   aggiunge una newline alla fine dell'input e\n"
 "                                rimuove una newline dalla fine dell'output"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=FILESCRIPT       aggiunge i contenuti di FILESCRIPT ai comandi\n"
 "                              da eseguire\n"
 
 # FIXME
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       sopprime la stampa automatica dello spazio dei\n"
+"  -n, --quiet, --silent       sopprime la stampa automatica dello spazio "
+"dei\n"
 "                              modelli\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             non usa gli escape del C nell'output (predefinito)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             non usa gli escape del C nell'output "
+"(predefinito)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                stile di output indentato\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, 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"
+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:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "il filtro di output non termina con newline"
 
-#: src/msgfmt.c:346
+#: src/msgfmt.c:372
 #, 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:393
+#: src/msgfmt.c:419
 #, 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:423 src/msgunfmt.c:269 src/xgettext.c:652
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:440
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "nessun file di input va indicato se sono specificati %s e %s"
 
-#: src/msgfmt.c:485 src/msgfmt.c:507 src/msgfmt.c:529 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:500 src/msgfmt.c:522 src/msgfmt.c:557 src/msgunfmt.c:324
-#: src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:539
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s richiede una specificazione \"--template template\""
 
-#: src/msgfmt.c:546
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s richiede una specificazione \"-o file\""
 
-#: src/msgfmt.c:552
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s sono mutuamente esclusive in %s"
 
-#: src/msgfmt.c:566 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:572 src/msgfmt.c:578
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s è valido solo con %s, %s o %s"
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "impossibile creare il file di output \"%s\""
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:741
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:745
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d messaggio tradotto"
 msgstr[1] "%d messaggi tradotti"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduzione fuzzy"
 msgstr[1] ", %d traduzioni fuzzy"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:886
 #, 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:775
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 
 # FIXME
-#: src/msgfmt.c:779
+#: src/msgfmt.c:910
 #, 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:784 src/xgettext.c:913
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
 msgstr ""
-"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
-"Similmente per gli argomenti opzionali.\n"
+"Genera un catalogo binario di messaggi dalla descrizione di traduzioni "
+"testuali.\n"
 
-#: src/msgfmt.c:791
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             file di input\n"
 
-#: src/msgfmt.c:798 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:962
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/msgfmt.c:800
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  modo Java: genera una classe Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  modo Java: genera una classe Java "
+"ResourceBundle\n"
 
-#: src/msgfmt.c:802
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 come --java, e assume Java2 (JDK 1.2 o superiore)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 come --java, e assume Java2 (JDK 1.2 o "
+"superiore)\n"
 
-#: src/msgfmt.c:804
+#: src/msgfmt.c:935
 #, 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:806
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      modo risorse C#: genera un file .NET .resources\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      modo risorse C#: genera un file .NET ."
+"resources\n"
 
-#: src/msgfmt.c:808
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   modo Tcl: genera un file tcl/msgcat .msg\n"
+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:810
+#: src/msgfmt.c:941
 #, 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:812
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:819
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                abilita il modo Uniforum strict\n"
 
-#: src/msgfmt.c:821 src/xgettext.c:937
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
+msgstr ""
+"Se il file di output è -, l'output viene scritto sullo standard output.\n"
 
-#: src/msgfmt.c:824
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Posizione del file di output in modo Java:\n"
 
-#: src/msgfmt.c:826 src/msgfmt.c:842 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:828 src/msgfmt.c:844 src/msgfmt.c:854 src/msgfmt.c:864
-#: src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
 
-#: src/msgfmt.c:830
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                produce un file .java invece di un file .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                produce un file .java invece di un file ."
+"class\n"
 
 # FIXME
-#: src/msgfmt.c:832
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
-"  -d DIRECTORY                directory base della gerarchia di directory delle\n"
+"  -d DIRECTORY                directory base della gerarchia di directory "
+"delle\n"
 "                              classi\n"
 
-#: src/msgfmt.c:834
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1872,19 +2277,22 @@ msgstr ""
 "della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
 "La classe viene scritta nella directory specificata.\n"
 
-#: src/msgfmt.c:840
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Posizione del file di output in modo C#:\n"
 
-#: src/msgfmt.c:846 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
-"  -d DIRECTORY                directory base per i file .dll dipendenti dalla\n"
+"  -d DIRECTORY                directory base per i file .dll dipendenti "
+"dalla\n"
 "                              locale\n"
 
-#: src/msgfmt.c:848
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1893,17 +2301,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:852
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Posizione del file di output in modo Tcl:\n"
 
-#: src/msgfmt.c:856 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d DIRECTORY                directory base dei cataloghi di messaggi .msg\n"
 
-#: src/msgfmt.c:858
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1912,22 +2321,22 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
 "directory indicata.\n"
 
-#: src/msgfmt.c:862
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         un file .desktop usato come template\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                directory base dei file .po\n"
 
-#: src/msgfmt.c:872 src/xgettext.c:991
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -1936,185 +2345,210 @@ msgstr ""
 "  -kPAROLA, --keyword=PAROLA  cerca PAROLA come parola chiave aggiuntiva\n"
 "  -k, --keyword               non usa le parole chiave predefinite\n"
 
-#: src/msgfmt.c:875
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Le opzioni -l, -o, e --template sono obbligatorie. Se è specificato -D, i file\n"
+"Le opzioni -l, -o, e --template sono obbligatorie. Se è specificato -D, i "
+"file\n"
 "di input vengono letti dalla directory invece che dalla riga di comando.\n"
 
-#: src/msgfmt.c:887 src/xgettext.c:954
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, fuzzy, c-format
+#| msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr "  --template=TEMPLATE         un file .desktop usato come template\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretazione del file di input:\n"
 
-#: src/msgfmt.c:889
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 esegue tutti i controlli implicati da\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:892
+#: src/msgfmt.c:1041
 #, 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:894
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 "      --check-header          verifica l'esistenza e il contenuto\n"
 "                              dell'intestazione\n"
 
-#: src/msgfmt.c:896
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          controlla i conflitti tra le direttive di dominio\n"
+"      --check-domain          controlla i conflitti tra le direttive di "
+"dominio\n"
 "                              e l'opzione --output-file\n"
 
-#: src/msgfmt.c:899
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   controlla che GNU msgfmt si comporti come\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:901
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CAR]  controlla la presenza degli acceleratori\n"
 "                                da tastiera per le voci di menù\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:1053
 #, 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:909
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMERO      allinea le stringhe a NUMERO byte\n"
 "                              (predefinito: %d)\n"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=BYTEORDER  scrive numeri a 32 bit con l'ordine dei byte\n"
 "                              richiesto (big o little, predefinito: dipende\n"
 "                              dall'architettura)\n"
 
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1063
 #, 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"
+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:923
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            stampa statistiche sulle traduzioni\n"
 
-#: src/msgfmt.c:925 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 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:1038
+#: src/msgfmt.c:1185
 #, 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:1041
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
 
-#: src/msgfmt.c:1051
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "attenzione: intestazione fuzzy del file PO\n"
-
-#: src/msgfmt.c:1053
-#, 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:1077
+#: src/msgfmt.c:1211
 #, 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:1082
+#: src/msgfmt.c:1216
 #, 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:1096
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direttiva di dominio \"%s\" ignorata"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" vuota"
 
-#: src/msgfmt.c:1157
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" fuzzy"
 
-#: src/msgfmt.c:1206
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
 
-#: src/msgfmt.c:1324
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s non esiste"
 
-#: src/msgfmt.c:1335
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s esiste ma non può essere letto"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:566
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:164 src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176
-#: src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "l'opzione \"%c\" non può essere usata prima di aver specificato \"J\", \"K\", \"T\", \"C\" o \"X\"."
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"l'opzione \"%c\" non può essere usata prima di aver specificato \"J\", \"K"
+"\", \"T\", \"C\" o \"X\"."
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2123,7 +2557,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2199,35 +2633,45 @@ msgstr ""
 "  -v, --invert-match          emette solo i messaggi che non corrispondono ad\n"
 "                              alcun criterio di selezione\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                usa gli escape del C nell'output, nessun carattere\n"
+"      --escape                usa gli escape del C nell'output, nessun "
+"carattere\n"
 "                              esteso\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera un output ordinato\n"
 
 # FIXME
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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"
+msgstr ""
+"      --sort-by-file          ordina l'output in base alla posizione nel "
+"file\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Ci si trova in un ambiente indifferente alla lingua. Impostare la\n"
 "variabile d'ambiente LANG, come descritto nel file ABOUT-NLS. Questo\n"
 "è necessario per verificare le proprie traduzioni.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2238,12 +2682,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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creato %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2252,26 +2696,28 @@ msgstr ""
 "Crea un nuovo file PO, inizializzando le meta informazioni con valori\n"
 "dall'ambiente dell'utente.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FILEINPUT       file POT di input\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Se nessun file di input è indicato, il file POT viene cercato nella directory\n"
+"Se nessun file di input è indicato, il file POT viene cercato nella "
+"directory\n"
 "corrente. Se è -, viene letto lo standard input.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2281,17 +2727,21 @@ msgstr ""
 "dalle impostazioni della locale dell'utente. Se è -, i risultati vengono\n"
 "scritti sullo standard output.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          imposta la locale obiettivo\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         assume che il file PO sia generato automaticamente\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         assume che il file PO sia generato "
+"automaticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2299,12 +2749,12 @@ msgstr ""
 "Più di un file .pot trovato.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "errore durante la lettura della directory corrente"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2312,21 +2762,24 @@ msgstr ""
 "Nessun file .pot trovato nella directory corrente.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/msginit.c:1419 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "sottoprocesso %s non riuscito con codice d'uscita %d"
 
 # FIXME
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Il nuovo catalogo di messaggi dovrebbe contenere il proprio indirizzo email,\n"
+"Il nuovo catalogo di messaggi dovrebbe contenere il proprio indirizzo "
+"email,\n"
 "così che gli utenti possono fornire pareri sulle traduzioni, e i curatori\n"
 "possono avere un contatto in caso di problemi tecnici imprevisti.\n"
 
@@ -2334,44 +2787,53 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1616
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduzioni italiane per il pacchetto %s."
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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"
+msgstr ""
+"il set di caratteri corrente \"%s\" non è un nome di codifica portabile"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "l'intestazione del file di input \"%s\" non contiene una specificazione del set di caratteri"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"l'intestazione del file di input \"%s\" non contiene una specificazione del "
+"set di caratteri"
 
-#: src/msgl-cat.c:208
+#: 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 "il dominio \"%s\" nel file di input \"%s\" non contiene un'intestazione con una specificazione del set di caratteri"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"il dominio \"%s\" nel file di input \"%s\" non contiene un'intestazione con "
+"una specificazione del set di caratteri"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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"
+msgstr ""
+"il set di caratteri obiettivo \"%s\" non è un nome di codifica portabile"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:554 src/xgettext.c:3532
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2380,10 +2842,11 @@ 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:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2391,7 +2854,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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2404,7 +2867,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2417,12 +2880,12 @@ msgstr ""
 "L'output di \"%s\" potrebbe essere incorretto.\n"
 "Possibili soluzioni sono:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2433,7 +2896,7 @@ msgstr ""
 "  applicare \"%s\",\n"
 "  poi convertire di nuovo in %s con \"msgconv\".\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2446,92 +2909,104 @@ msgstr ""
 "  applicare \"%s\",\n"
 "  poi convertire di nuovo in %s con \"msgconv\".\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Il set di caratteri \"%s\" della locale non è un nome di codifica portabile.\n"
+"Il set di caratteri \"%s\" della locale non è un nome di codifica "
+"portabile.\n"
 "L'output di \"%s\" potrebbe essere incorretto.\n"
 "Una possibile soluzione è impostare LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "l'espressione plurale può produrre valori negativi"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu, ma l'espressione plurale può produrre valori fino a %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "l'espressione plurale può produrre una divisione per zero"
 
 # FIXME
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "l'espressione plurale può produrre un overflow dell'intero"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "l'espressione plurale può produrre una eccezione aritmetica, forse una divisione per zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"l'espressione plurale può produrre una eccezione aritmetica, forse una "
+"divisione per zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Provare ad usare il seguente, valido per %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "il catalogo dei messaggi contiene traduzioni di forme plurali"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=ESPRESSIONE\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=INTERO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valore di nplurals non valido"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "espressione plurale non valida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, 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:495
+#: src/msgl-check.c:494
 #, 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:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "il catalogo di messaggi contiene traduzioni di forme plurali, ma l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; plural=ESPRESSIONE;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"il catalogo di messaggi contiene traduzioni di forme plurali, ma "
+"l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; "
+"plural=ESPRESSIONE;\""
 
 #: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "le voci \"msgid\" e \"msgid_plural\" non cominciano entrambe con \"\\n\""
+msgstr ""
+"le voci \"msgid\" e \"msgid_plural\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, 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\""
@@ -2542,9 +3017,10 @@ msgstr "le voci \"msgid\" e \"msgstr\" non cominciano entrambe con \"\\n\""
 
 #: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "le voci \"msgid\" e \"msgid_plural\" non finiscono entrambe con \"\\n\""
+msgstr ""
+"le voci \"msgid\" e \"msgid_plural\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, 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\""
@@ -2557,86 +3033,108 @@ msgstr "le voci \"msgid\" e \"msgstr\" non finiscono entrambe con \"\\n\""
 msgid "plural handling is a GNU gettext extension"
 msgstr "la gestione del plurale è un'estensione di GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, 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:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "in msgstr ci sono troppi caratteri \"%c\" per l'acceleratore da tastiera"
+msgstr ""
+"in msgstr ci sono troppi caratteri \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
-msgstr "il campo di intestazione \"%s\" è ancora al valore iniziale predefinito\n"
+msgstr ""
+"il campo di intestazione \"%s\" è ancora al valore iniziale predefinito\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo \"%s\" mancante nell'intestazione\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "punti di sospensione ASCII ('...') invece che Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "usate virgolette doppie ASCII invece che Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "usate virgolette singole invece che Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, fuzzy, c-format
+#| msgid "ASCII ellipsis ('...') instead of Unicode"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "punti di sospensione ASCII ('...') invece che Unicode"
+
+#: 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:70
+#: 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\""
+msgstr ""
+"%s: errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"il file di input non contiene un'intestazione con una specificazione del set "
+"di caratteri"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/x-python.c:666 src/xgettext.c:751
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(), e iconv() non gestisce questa conversione."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(), e iconv() "
+"non gestisce questa conversione."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
-"La conversione da \"%s\" a \"%s\" introduce duplicati: alcuni msgid diventano\n"
+"La conversione da \"%s\" a \"%s\" introduce duplicati: alcuni msgid "
+"diventano\n"
 "uguali."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/x-python.c:673
-#: src/xgettext.c:758
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(). Questa versione è stata compilata senza iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(). Questa "
+"versione è stata compilata senza iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s è valido solamente con %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tipo di backup"
 
 # FIXME UPSTREAM
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2661,26 +3159,29 @@ msgstr ""
 "Quando è impossibile trovare una corrispondenza esatta, una corrispondenza\n"
 "approssimativa (fuzzy) è usata per ottenere i migliori risultati.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      traduzioni che si riferiscono alle vecchie fonti\n"
+msgstr ""
+"  def.po                      traduzioni che si riferiscono alle vecchie "
+"fonti\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     riferimenti alle nuove fonti\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FILE       libreria aggiuntiva di traduzioni di messaggi,\n"
+"  -C, --compendium=FILE       libreria aggiuntiva di traduzioni di "
+"messaggi,\n"
 "                              può essere specificata più di una volta\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2689,31 +3190,32 @@ msgstr ""
 "  -U, --update                aggiorna il file def.po,\n"
 "                              non fa niente se def.po è già aggiornato\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, 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:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Il risultato è riscritto in def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFISSO       cambia il solito suffisso dei backup\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2721,115 +3223,142 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 "Il metodo di controllo di versione può essere impostato con l'opzione\n"
-"--backup o la variabile d'ambiente VERSION_CONTROL. I valori possibili sono:\n"
+"--backup o la variabile d'ambiente VERSION_CONTROL. I valori possibili "
+"sono:\n"
 "  none, off       non fa mai backup (anche se è specificato --backup)\n"
 "  numbered, t     fa backup numerati\n"
 "  existing, nil   numerati se esistono backup numerati, altrimenti semplici\n"
 "  simple, never   fa sempre backup semplici\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              mantiene i precedenti msgid dei messaggi tradotti\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              mantiene i precedenti msgid dei messaggi "
+"tradotti\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       sopprime gli indicatori di avanzamento\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "questo messaggio dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "questo messaggio non dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sLetti %ld vecchi + %ld riferimenti, fusi %ld, fuzzy %ld, persi %ld, obsoleti %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLetti %ld vecchi + %ld riferimenti, fusi %ld, fuzzy %ld, persi %ld, "
+"obsoleti %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " fatto.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILE]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Converte un catalogo binario di messaggi in un file .po in stile Uniforum.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
-"  -j, --java                  modo Java: l'input è una classe ResourceBundle\n"
+"  -j, --java                  modo Java: l'input è una classe "
+"ResourceBundle\n"
 "                              di Java\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      modo risorse C#: l'input è un file .NET .resources\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      modo risorse C#: l'input è un file .NET ."
+"resources\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+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:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    file .mo di input\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Il nome della classe è determinato aggiungendo il nome della locale al nome\n"
 "della risorsa, separata da una sottolineatura. La classe viene localizzata\n"
 "con CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2838,12 +3367,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:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2852,18 +3381,18 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg si trova della directory\n"
 "indicata.\n"
 
-#: src/msgunfmt.c:512
+#: 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:514
+#: 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:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2886,17 +3415,21 @@ msgstr ""
 "traduzione. Le posizioni dei file vengono accumulate. Quando si usa l'opzione\n"
 "--unique, i duplicati vengono scartati.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              stampa solo i duplicati\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                stampa solo i messaggi unici, scarta i duplicati\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                stampa solo i messaggi unici, scarta i "
+"duplicati\n"
 
-#: src/open-catalog.c:57 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>"
@@ -2908,7 +3441,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Il set di caratteri \"%s\" non è un nome di codifica portabile.\n"
-"La conversione del messaggio nel set di caratteri dell'utente potrebbe fallire.\n"
+"La conversione del messaggio nel set di caratteri dell'utente potrebbe "
+"fallire.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -2924,7 +3458,8 @@ msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Questo problema può essere risolto installando GNU libiconv e poi reinstallando\n"
+"Questo problema può essere risolto installando GNU libiconv e poi "
+"reinstallando\n"
 "GNU gettext.\n"
 
 #: src/po-charset.c:578 src/po-charset.c:616
@@ -2950,34 +3485,35 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "L'intestazione non specifica un set di caratteri.\n"
-"La conversione del messaggio nel set di caratteri dell'utente non funzionerà.\n"
+"La conversione del messaggio nel set di caratteri dell'utente non "
+"funzionerà.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso improprio di #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "manca la sezione \"msgstr[]\""
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "manca la sezione \"msgid_plural\""
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "manca la sezione \"msgstr\""
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la prima forma plurale ha indice diverso da zero"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la forma plurale ha indice non corretto"
@@ -2987,7 +3523,7 @@ msgstr "la forma plurale ha indice non corretto"
 msgid "too many errors, aborting"
 msgstr "troppi errori, interrotto"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequenza multibyte non valida"
@@ -2997,41 +3533,41 @@ msgstr "sequenza multibyte non valida"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequenza multibyte non valida alla fine del file"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequenza multibyte non valida a fine riga"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "errore in iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la parola chiave \"%s\" è sconosciuta"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "sequenza di controllo non valida"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file all'interno di una stringa"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line all'interno di una stringa"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separatore di contesto <EOT> all'interno di una stringa"
 
-#: src/read-catalog.c:325 src/xgettext.c:1103
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
@@ -3044,39 +3580,78 @@ msgstr "definizione del messaggio duplicata"
 msgid "this is the location of the first definition"
 msgstr "questa è la posizione della prima definizione"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+#, fuzzy
+#| msgid "warning: invalid Unicode character"
+msgid "invalid non-blank character"
+msgstr "attenzione: carattere Unicode non valido"
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "nome di filtro mancante"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "valore di nplurals non valido"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "il file \"%s\" è troncato"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "il file \"%s\" contiene una stringa non terminata da NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "il file \"%s\" contiene una stringa non terminata da NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "il file \"%s\" non è nel formato GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "il file \"%s\" contiene una stringa non terminata da NUL, in %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "attenzione: sintassi \\uxxxx non valida per un carattere Unicode"
 
-#: src/read-stringtable.c:803
+# FIXME
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: attenzione: lone surrogate U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "attenzione: carattere Unicode non valido"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "attenzione: stringa non terminata"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "attenzione: errore di sintassi"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "attenzione: coppia chiave/valore non terminata"
 
@@ -3084,11 +3659,11 @@ msgstr "attenzione: coppia chiave/valore non terminata"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "attenzione: errore di sintassi, atteso \";\" dopo la stringa"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "attenzione: errore di sintassi, atteso \"=\" o \";\" dopo la stringa"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Scritto da %s e %s.\n"
@@ -3098,43 +3673,44 @@ msgstr "Scritto da %s e %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Ricodifica testo serbo dall'alfabeto cirillico all'alfabeto latino.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr "Il testo di input è letto dallo standard input. Il testo convertito è stampato su standard output.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "l'input non è valido in codifica \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
+msgstr ""
+"errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "attesi due argomenti"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uso: %s [OPZIONE] URL FILE\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3143,115 +3719,141 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "errore durante la scrittura su standard output"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "errore dopo la lettura di \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Scaricamento di %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " tempo scaduto.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " non riuscito\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Impossibile scrivere più domini di traduzione in un singolo file con il formato di output indicato. Usare la sintassi del file PO invece."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Impossibile scrivere più domini di traduzione in un singolo file con il "
+"formato di output indicato. Usare la sintassi del file PO invece."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Impossibile scrivere più domini di traduzione in un singolo file con il formato di output indicato."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Impossibile scrivere più domini di traduzione in un singolo file con il "
+"formato di output indicato."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "il catalogo dei messaggi contiene traduzioni dipendenti dal contesto, ma il formato di output non le gestisce."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"il catalogo dei messaggi contiene traduzioni dipendenti dal contesto, ma il "
+"formato di output non le gestisce."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "di output non le gestisce. Provare a generare una classe Java usando\n"
 "\"msgfmt --java\", invece di usare un file di proprietà."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "di output non le gestisce."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossibile creare il file di output \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "creazione della directory \"%s\" non riuscita"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "compilazione della classe C# non riuscita, provare --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "compilazione della classe C# non riuscita"
 
-#: src/write-java.c:1092
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "errore durante l'apertura di \"%s\" in scrittura"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nome di classe Java non valido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"compilazione della classe Java non riuscita, provare --verbose o impostare "
+"$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "compilazione della classe Java non riuscita, provare a impostare $JAVAC"
-
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "errore durante l'apertura di \"%s\" in scrittura"
+msgstr ""
+"compilazione della classe Java non riuscita, provare a impostare $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "sequenza multibyte incompleta"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "i messaggi internazionalizzati non devono contenere la sequenza di escape \"\\%c\""
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"i messaggi internazionalizzati non devono contenere la sequenza di escape "
+"\"\\%c\""
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3264,7 +3866,7 @@ msgstr ""
 "diversa dalla propria. Considerare l'uso di un msgctxt in puro ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3282,17 +3884,21 @@ msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "dei cataloghi Qt non le gestisce.\n"
 
 #: src/write-qt.c:694
 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"
-"ma il formato dei cataloghi Qt gestisce Unicode solo nelle stringhe tradotte,\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"
 
 #: src/write-qt.c:718
@@ -3301,16 +3907,18 @@ 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"
-"ma il formato dei cataloghi Qt gestisce Unicode solo nelle stringhe tradotte,\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"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "errore durante la scrittura sul sottoprocesso %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3318,15 +3926,16 @@ 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:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "delle risorse C# non le gestisce.\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3334,44 +3943,65 @@ msgstr ""
 "il catalogo dei messaggi contiene traduzioni dipendenti dal contesto,\n"
 "ma il formato dei cataloghi Tcl non le gestisce.\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "dei cataloghi Tcl non le gestisce.\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: attenzione: stringa non terminata"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: attenzione: espressione regolare non terminata"
 
-#: src/x-c.c:1153
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "attenzione: carattere Unicode non valido"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: attenzione: carattere Unicode non valido"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: attenzione: costante stringa non terminata"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-c.c:1464 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: attenzione: costante stringa non terminata"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attenzione: costante carattere non terminata"
 
-#: src/x-c.c:1520 src/x-c.c:1571 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:225 src/xgettext.c:2168
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Specificare la codifica del sorgente usando --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3380,7 +4010,7 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3389,7 +4019,7 @@ msgstr ""
 "%s:%d: sequenza multibyte lunga incompleta.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3398,7 +4028,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:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3407,12 +4037,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:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv non riuscita"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3421,61 +4051,427 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: attenzione: carattere Unicode non valido"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: attenzione: trovata \")\" dove era prevista \"}\""
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
 
-#: src/x-glade.c:296
+#: src/xgettext.c:567
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Contesto mancante per la stringa estratta dall'elemento \"%s\""
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr "\"%s\" non è un nome di codifica valido. Verrà usato ASCII.\n"
 
-#: src/x-glade.c:418
+#: src/xgettext.c:637
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "L'elemento radice <%s> non è ammesso in un file di Glade valido"
+msgid "syntax check '%s' unknown"
+msgstr ""
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr ""
 
-#: src/x-glade.c:573 src/x-glade.c:580
+#: src/xgettext.c:701
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+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:705
+#, c-format
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext non può operare senza parole chiavi da ricercare"
 
-#: src/x-glade.c:607
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
+
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"Il linguaggio \"glade\" non è gestito. %s si basa su expat.\n"
-"Questa versione è stata compilata senza expat.\n"
 
-# FIXME
-#: src/x-java.c:494
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: attenzione: lone surrogate U+%04X"
+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:1027
+#, 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:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NOME   usa NOME.po per l'output (invece di messages."
+"po)\n"
+
+#: src/xgettext.c:1052
+#, 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:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=DIR        i file di output saranno posizionati nella\n"
+"                              directory DIR\n"
+
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Scelta del linguaggio del file di input:\n"
+
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=NOME         riconosce i linguaggi specificati\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
+
+#: src/xgettext.c:1070
+#, c-format
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Come impostazione predefinita, la scelta del linguaggio si basa "
+"sull'estensione del file di input.\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=NOME        codifica dei file di input\n"
+"                                (ad eccezione di Python, Tcl, Glade)\n"
+
+#: src/xgettext.c:1078
+#, 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:1083
+#, 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:1085
+#, 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:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cTAG, --add-comments=TAG   mette il blocco di commenti che contiene TAG "
+"e\n"
+"                                che precedono le righe di parole chiave nel\n"
+"                                file di output \n"
+"  -c, --add-comments          mette tutti i blocchi di commenti che "
+"precedono\n"
+"                                le righe di parole chiave nel file di "
+"output\n"
+
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Opzioni di linguaggio specifiche:\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=PAROLA:ARG:FLAG  flag aggiuntiva per le stringhe "
+"nell'argomento\n"
+"                              numero ARG della parola chiave PAROLA\n"
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1126
+#, 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:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (solo linguaggio C++)\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (solo linguaggio C++)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 mostra in modo più dettagliato il risultato "
+"del\n"
+"                              riconoscimento della stringa di formato\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     scrive un file .properties Java\n"
+
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --indent                stile di output indentato\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+"      --copyright-holder=STRINGA imposta il titolare del copyright in "
+"output\n"
+
+# FIXME UPSTREAM
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          omette dall'output il copyright della FSF per\n"
+"                              gli utenti non GNU\n"
+
+#: src/xgettext.c:1192
+#, 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:1194
+#, 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:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@INDIRIZZO  imposta l'indirizzo a cui "
+"segnalare\n"
+"                              errori nelle voci msgid\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[STRINGA], --msgstr-prefix[=STRINGA]  usa STRINGA o \"\" come prefisso "
+"nelle\n"
+"                                voci msgstr\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[STRINGA], --msgstr-suffix[=STRINGA]  usa STRINGA o \"\" come suffisso "
+"nelle\n"
+"                                voci msgstr\n"
+
+# FIXME UPSTREAM
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"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:1695
+msgid "standard input"
+msgstr "standard input"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"L'opzione --msgid-bugs-address non è stata indicata.\n"
+"Se si sta usando un file \"Makevars\", specificare la\n"
+"variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
+"l'opzione --msgid-bugs-address da riga di comando.\n"
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "linguaggio \"%s\" sconosciuto"
 
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Specificare la codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3484,7 +4480,7 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la corretta codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3493,7 +4489,7 @@ msgstr ""
 "%s:%d: sequenza multibyte lunga incompleta.\n"
 "Indicare la corretta codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3502,7 +4498,7 @@ msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine del file.\n"
 "Indicare la corretta codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3511,7 +4507,7 @@ msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
 "Indicare la corretta codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3520,536 +4516,455 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: attenzione: costante RegExp terminata troppo presto"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: attenzione: %s non è permesso"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: attenzione: markup XML non terminato"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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"
+msgstr ""
+"%s:%d: impossibile trovare il terminatore di stringa \"%s\" prima di EOF"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \"}\" mancante in \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolazione variabile non valida in \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 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:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
-"Indicare la corretta codifica del sorgente usando --from-code o con un commento\n"
+"Indicare la corretta 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:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: sequenza multibyte lunga incompleta.\n"
-"Indicare la corretta codifica del sorgente usando --from-code o con un commento\n"
+"Indicare la corretta 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:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine del file.\n"
-"Indicare la corretta codifica del sorgente usando --from-code o con un commento\n"
+"Indicare la corretta 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:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
-"Indicare la corretta codifica del sorgente usando --from-code o con un commento\n"
+"Indicare la corretta 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:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "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:723
+#: src/x-python.c:654
 #, 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:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definizione stringa non valida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: numero mancante dopo #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: espressione stringa non valida"
 
-#: src/x-sh.c:1075
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: attenzione: la sintassi $\"...\" è deprecata per motivi di sicurezza; usare eval_gettext al suo posto"
-
-#: src/x-vala.c:414
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: definizione stringa non valida"
 
-#: src/xgettext.c:555
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "\"%s\" non è un nome di codifica valido. Verrà usato ASCII.\n"
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: definizione stringa non valida"
 
-#: src/xgettext.c:624
+#: src/x-rst.c:691
 #, c-format
-msgid "syntax check '%s' unknown"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
 
-#: src/xgettext.c:633
+#: src/x-sh.c:1101
 #, c-format
-msgid "sentence end type '%s' unknown"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
 msgstr ""
+"%s:%lu: attenzione: la sintassi $\"...\" è deprecata per motivi di "
+"sicurezza; usare eval_gettext al suo posto"
 
-#: src/xgettext.c:679
+#: src/x-vala.c:616
 #, 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"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
 
-#: src/xgettext.c:684
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext non può operare senza parole chiavi da ricercare"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<senza nome>"
 
-#: src/xgettext.c:839
-#, 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"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "sequenza di controllo non valida"
 
-#: src/xgettext.c:908
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Estrae le stringhe traducibili dai file di input indicati.\n"
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "nome di classe Java non valido: %s"
 
-#: src/xgettext.c:931
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NOME   usa NOME.po per l'output (invece di messages.po)\n"
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "nome di classe Java non valido: %s"
 
-#: src/xgettext.c:933
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FILE           scrive l'output sul file indicato\n"
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "sequenza di controllo non valida"
 
-#: src/xgettext.c:935
-#, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
 msgstr ""
-"  -p, --output-dir=DIR        i file di output saranno posizionati nella\n"
-"                              directory DIR\n"
-
-#: src/xgettext.c:940
-#, c-format
-msgid "Choice of input file language:\n"
-msgstr "Scelta del linguaggio del file di input:\n"
 
-#: src/xgettext.c:942
-#, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
 msgstr ""
-"  -L, --language=NOME         riconosce i linguaggi specificati\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:949
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
 
-#: src/xgettext.c:951
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Come impostazione predefinita, la scelta del linguaggio si basa sull'estensione del file di input.\n"
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
 
-#: src/xgettext.c:956
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
+#: libgettextpo/markup.c:604
+msgid "unknown"
 msgstr ""
-"      --from-code=NOME        codifica dei file di input\n"
-"                                (ad eccezione di Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:959
-#, 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"
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "endianness non valida: %s"
 
-#: src/xgettext.c:964
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         unisce i messaggi con il file esistente\n"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
 
-#: src/xgettext.c:966
-#, 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"
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "argomento %s non valido per %s"
 
-#: src/xgettext.c:968
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid ""
-"  -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"
+msgid "missing '%c'"
 msgstr ""
-"  -cTAG, --add-comments=TAG   mette il blocco di commenti che contiene TAG e\n"
-"                                che precedono le righe di parole chiave nel\n"
-"                                file di output \n"
-"  -c, --add-comments          mette tutti i blocchi di commenti che precedono\n"
-"                                le righe di parole chiave nel file di output\n"
 
-#: src/xgettext.c:973
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid ""
-"      --check=NAME            perform syntax check on messages\n"
-"                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+msgid "missing '%c' or '%c'"
 msgstr ""
 
-#: src/xgettext.c:977
-#, c-format
-msgid ""
-"      --sentence-end=TYPE     type describing the end of sentence\n"
-"                                (single-space, which is the default, \n"
-"                                 or double-space)\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
 msgstr ""
 
-#: src/xgettext.c:982
-#, c-format
-msgid "Language specific options:\n"
-msgstr "Opzioni di linguaggio specifiche:\n"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
 
-#: src/xgettext.c:984
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
 
-#: src/xgettext.c:986
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
 msgstr ""
-"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:994
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
 msgstr ""
-"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:999
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
 msgstr ""
-"      --flag=PAROLA:ARG:FLAG  flag aggiuntiva per le stringhe nell'argomento\n"
-"                              numero ARG della parola chiave PAROLA\n"
 
-#: src/xgettext.c:1002
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
 msgstr ""
-"                                (solo linguaggi C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1007
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             riconosce i trigrammi ANSI C in input\n"
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "nome di filtro mancante"
 
-#: src/xgettext.c:1009
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
 
-#: src/xgettext.c:1011
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
 
-#: src/xgettext.c:1013 src/xgettext.c:1017 src/xgettext.c:1021
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (solo linguaggio C++)\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
 
-#: src/xgettext.c:1015
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
 
-#: src/xgettext.c:1019
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
 
-#: src/xgettext.c:1023
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid "document ended unexpectedly: %s"
 msgstr ""
-"      --debug                 mostra in modo più dettagliato il risultato del\n"
-"                              riconoscimento della stringa di formato\n"
 
-#: src/xgettext.c:1048
 #, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     scrive un file .properties Java\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n"
 
-#: src/xgettext.c:1063
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRINGA imposta il titolare del copyright in output\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opzione \"--%s\" non riconosciuta\n"
 
-# FIXME UPSTREAM
-#: src/xgettext.c:1065
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-"      --foreign-user          omette dall'output il copyright della FSF per\n"
-"                              gli utenti non GNU\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
 
-#: src/xgettext.c:1067
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=NOME     imposta il nome del pacchetto in output\n"
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n"
 
-#: src/xgettext.c:1069
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=VERSIONE imposta la versione del pacchetto in output\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
 
-#: src/xgettext.c:1071
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-"      --msgid-bugs-address=EMAIL@INDIRIZZO  imposta l'indirizzo a cui segnalare\n"
-"                              errori nelle voci msgid\n"
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "attenzione: intestazione fuzzy del file PO\n"
 
-#: src/xgettext.c:1073
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -m[STRINGA], --msgstr-prefix[=STRINGA]  usa STRINGA o \"\" come prefisso nelle\n"
-"                                voci msgstr\n"
+#~ 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/xgettext.c:1076
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -M[STRINGA], --msgstr-suffix[=STRINGA]  usa STRINGA o \"\" come suffisso nelle\n"
-"                                voci msgstr\n"
+#~ msgid "Missing context for the string extracted from '%s' element"
+#~ msgstr "Contesto mancante per la stringa estratta dall'elemento \"%s\""
 
-# FIXME UPSTREAM
-#: src/xgettext.c:1902
 #, c-format
-msgid "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"
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
 
-#: src/xgettext.c:2027
-msgid "standard input"
-msgstr "standard input"
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Il linguaggio \"glade\" non è gestito. %s si basa su expat.\n"
+#~ "Questa versione è stata compilata senza expat.\n"
 
-#: src/xgettext.c:2133
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Carattere non ASCII in %s%s."
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Carattere non ASCII in %s%s."
 
-#: src/xgettext.c:2137
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Commento non ASCII in o prima di %s%s."
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Commento non ASCII in o prima di %s%s."
 
-#: src/xgettext.c:2142
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Stringa non ASCII in %s%s."
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Stringa non ASCII in %s%s."
 
-#: src/xgettext.c:2248 src/xgettext.c:2281 src/xgettext.c:2346
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: attenzione: "
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: attenzione: "
 
-#: src/xgettext.c:2251
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Sebbene usata dove dovrebbe esserci una stringa di formato, %s non è una stringa di formato %s valida. Motivo: %s\n"
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Sebbene usata dove dovrebbe esserci una stringa di formato, %s non è una "
+#~ "stringa di formato %s valida. Motivo: %s\n"
 
-#: src/xgettext.c:2252
 #, c-format
-msgid "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"
+#~ msgid ""
+#~ "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:2283
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"La stringa di formato \"%s\" con argomenti senza nome non può essere tradotta\n"
-"appropriatamente: il traduttore non può riordinare gli argomenti.\n"
-"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"
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "La stringa di formato \"%s\" con argomenti senza nome non può essere "
+#~ "tradotta\n"
+#~ "appropriatamente: il traduttore non può riordinare gli argomenti.\n"
+#~ "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:2348
-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 ""
-"Msgid vuoto. Questo è riservato per GNU gettext:\n"
-"gettext(\"\") restituisce l'intestazione con\n"
-"le metainformazioni, non la stringa vuota.\n"
+#~ 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 ""
+#~ "Msgid vuoto. Questo è riservato per GNU gettext:\n"
+#~ "gettext(\"\") restituisce l'intestazione con\n"
+#~ "le metainformazioni, non la stringa vuota.\n"
 
-#: src/xgettext.c:3085
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3112
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3137
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "attenzione: contesto mancante per l'argomento plurale della parola chiave \"%.*s\""
+#~ 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:3158
 #, 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:3533
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"L'opzione --msgid-bugs-address non è stata indicata.\n"
-"Se si sta usando un file \"Makevars\", specificare la\n"
-"variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
-"l'opzione --msgid-bugs-address da riga di comando.\n"
-
-#: src/xgettext.c:3753
-#, c-format
-msgid "language '%s' unknown"
-msgstr "linguaggio \"%s\" sconosciuto"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<senza nome>"
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "differenza di contesto tra la forma singolare e la forma plurale"
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index e8def5f80..55ae80213 100644
--- 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.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-01 19:35+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -15,19 +15,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s ���Ф������ %1$s ���ְ�äƤ��ޤ�"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s ���Ф������ %1$s ��ۣ��Ǥ�"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "����������:"
 
@@ -55,201 +56,186 @@ msgstr "����ǥ��쥯�ȥ� %s �����Ǥ��ޤ���"
 msgid "write error"
 msgstr "�񤭹��ߥ��顼"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s ���Ф��륢����������ݻ�"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "%s ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "�Хå����åץե����� %s ��񤭹����Ѥ˳������Ȥ��Ǥ��ޤ���"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "%s ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "%s ��񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "%s ���ɤ߹������˥��顼��ȯ�����ޤ���"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() ����"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C# ����ѥ��餬���Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C# ���ۥޥ��󤬸��Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ���֥ץ����������Ԥ��ޤ���"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: ���ץ���� '%s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: ���ץ���� '%s' ��ۣ��. �����ǽ�ʤ��:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� '%c%s' �˰����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: ���ץ���� '--%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ���ץ���� `--%s' ���Բ�\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ���ץ���� '%c%s' ���Բ�\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵���ʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ������ɬ�פʥ��ץ���� -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class ���Ф���̵���� source_version ����"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class ���Ф���̵���� target_version ����"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" �������˼��Ԥ��ޤ���"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" �ե������񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java ����ѥ��餬���Ĥ���ޤ���. gcj �򥤥󥹥ȡ��뤹�뤫 $JAVAC �����ꤷ�ƤߤƤ�������"
+msgstr ""
+"Java ����ѥ��餬���Ĥ���ޤ���. gcj �򥤥󥹥ȡ��뤹�뤫 $JAVAC �����ꤷ�Ƥ�"
+"�Ƥ�������"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Java ���ۥޥ��󤬸��Ĥ���ޤ���. gij �򥤥󥹥ȡ��뤹�뤫 $JAVA �����ꤷ�Ƥ�������"
+msgstr ""
+"Java ���ۥޥ��󤬸��Ĥ���ޤ���. gij �򥤥󥹥ȡ��뤹�뤫 $JAVA �����ꤷ�Ƥ�"
+"������"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ���֥ץ����������ϥ��顼"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "����åɤ������˼���"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s �ؽ񤭽Ф����֥ץ����������Ԥ��ޤ���"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s ���֥ץ�����������ɤ߹��ߤ˼���"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "%s ���֥ץ������˥֥��å��󥰤��ʤ������Ϥ�����Ǥ��ޤ���"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s ���֥ץ������Ȥ��̿��˼���"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
@@ -273,13 +259,13 @@ msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
@@ -288,64 +274,69 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "%s ���Ф��륢��������������"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "�ѥ��פ��뤳�Ȥ��Ǥ��ޤ���"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ����"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d �������Ǥ��ޤ���: dup2 ����"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s ���֥ץ�����"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ���֥ץ���������̿Ū�ʥ����ʥ� %d ��������ޤ���"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "���Υ롼�����Ǥ� <%s> �Ǥʤ���Фʤ�ޤ���"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "���� <%s> �� <%s> ���Ǥ�ޤߤޤ���"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "���� <%s> ��°�� <%s> ������ޤ���"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "���¿���ξ�������뤿��ˤ� '%s --help' �����Ϥ��Ƥ�������.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "����ˡ: %s [���ץ����...] [��������롼��]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -360,7 +351,7 @@ msgstr ""
 "CLDR ʣ�����롼����ɤ߹���, gettext ���Ȥ���褦�ʷ���ɽ�����ޤ�.\n"
 "�������ʤ����, ɸ�����Ϥ��� CLDR ʣ�����롼����ɤ߹��ߤޤ�.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -369,27 +360,27 @@ msgstr ""
 "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 "ɬ�ܤǤʤ�������Ʊ���Ǥ�.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  CLDR ������ʣ�����롼���ɽ��\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ���Υإ�פ�ɽ�����ƽ�λ\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               �С����������ɽ�����ƽ�λ\n"
@@ -398,25 +389,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "�Х���ݡ��Ȥ� <bug-gnu-gettext@gnu.org> �ޤ�.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -429,77 +425,78 @@ msgstr ""
 "����ϥե꡼�����եȥ������Ǥ��Τ��ѹ��Ⱥ����ۤϼ�ͳ�Ǥ�.\n"
 "������ˡΧ�������ϰϤ�̵�ݾڤǤ�.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "��� %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s ���ɤ߹���ޤ���"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "%s ���Ф���롼�����ФǤ��ޤ���"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "CLDR �롼���ѡ����Ǥ��ޤ���"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr ";ʬ�ʥ��ڥ��� %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "���� %u ���Ф�������λ��꤬ '%s' �Τ褦�� '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "���� %3$u ���Ф��� '%1$s' �� '%2$s' �Ǥη����λ��꤬Ʊ���ǤϤ���ޤ���"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "̿���ֹ� %u ��, | �ǻϤޤäƤ��ޤ��� | �ǽ���äƤ��ޤ���."
@@ -509,56 +506,64 @@ msgstr "̿���ֹ� %u ��, | �ǻϤޤäƤ��ޤ��� | �ǽ���äƤ��ޤ���."
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' �������� %s ������ʸ����ǤϤʤ�, '%s' �Ȥϰ㤤�ޤ�. ��ͳ: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����ϥե����ޥåȵ��һҥޥ���̾�ǤϤ���ޤ���. �������ޥ���̾�� ISO C 99 �� 7.8.1 ��˰���������ޤ�."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����ϥե����ޥåȵ��һҥޥ���̾�ǤϤ���ޤ�"
+"��. �������ޥ���̾�� ISO C 99 �� 7.8.1 ��˰���������ޤ�."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����θ�� '>' ����뤳�ȤϤ���ޤ���."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "ʸ����ϰ����ֹ� %u �򻲾Ȥ��Ƥ��ޤ��������ֹ� %u ��̵�뤷�Ƥ��ޤ�."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'%s' �� '%s' �ǻ��ꤷ�������ο�����äƤ��ޤ���"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "̿���ֹ� %u �Ǥ�, '{' �θ�˰����ο�����뤳�ȤϤ���ޤ���."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "̿���ֹ� %u �Ǥ�, ',' �θ�˿�������뤳�ȤϤ���ޤ���."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "ʸ�����̿�������ǽ���äƤ��ޤ�: '{' �� '}' �����פ��Ƥ��ޤ���."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "̿���ֹ� %u ��, '}' �������������ʸ�� '%c' �ǽ���äƤ��ޤ�."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "̿���ֹ� %u ��, '}' �������������ʸ���ǽ���äƤ��ޤ�."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "ʸ�����̿������椫��ϤޤäƤ��ޤ�: '}' �� '{' �����פ��Ƥ��ޤ���."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "ʸ����̿���ֹ� %u �Τ��Ȥ��Ĥ��Ƥ��ʤ� '}' ��ޤ�Ǥ��ޤ�."
@@ -575,12 +580,16 @@ msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������٤���뤳�ȤϤ���ޤ���."
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "̿���ֹ� %u �Ǥ�, ���٤ΰ����ͤ� %u ���������ʤ��ƤϤʤ�ޤ���."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������ٻ��꤬��뤳�ȤϤ���ޤ���."
 
 #: src/format-gcc-internal.c:406
@@ -618,32 +627,45 @@ msgid "The string ends in the middle of a directive."
 msgstr "ʸ����̿�������ǽ���äƤ��ޤ�."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "ʸ�����, �ֹ��դ����줿������, �ֹ��դ�����Ƥ��ʤ�������, �ɤ���ΰ����⻲�Ȥ��Ƥ��ޤ�."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"ʸ�����, �ֹ��դ����줿������, �ֹ��դ�����Ƥ��ʤ�������, �ɤ���ΰ����⻲"
+"�Ȥ��Ƥ��ޤ�."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "̿���ֹ� %u �Ǥ�, �����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "̿���ֹ� %u �Ǥ�, ���ΰ����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "̿���ֹ� %u �Ǥ�, ���٤ΰ����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "̿���ֹ� %u �Ǥ�, ʸ�� '%c' ���������Ѵ����һҤǤϤ���ޤ���."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "̿���ֹ� %u �ν�üʸ�����������Ѵ����һҤǤϤ���ޤ���."
 
 #: src/format-invalid.h:40
@@ -651,60 +673,78 @@ msgstr "̿���ֹ� %u �ν�üʸ�����������Ѵ����һҤǤϤ���ޤ���."
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "ʸ�������ߴ�����ˡ�ǰ����ֹ� %u �򻲾Ȥ��Ƥ��ޤ�."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "̿���ֹ� %u �Ǥ�, \"%s\" �����������դ����η����ǤϤ���ޤ���."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "̿���ֹ� %u �Ǥ�, \"%s\" �θ�˥���ޤ���뤳�ȤϤ���ޤ���."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "̿���ֹ� %u �Ǥ�, \"%s\" �����������ͤη����ǤϤ���ޤ���."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-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\" ����� 1�Ĥ���뤳�ȤϤ���ޤ���."
+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\" ����"
+"�� 1�Ĥ���뤳�ȤϤ���ޤ���."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "̿���ֹ� %u �Ǥ�, �����˿��ͤ�����ޤ���."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "̿���ֹ� %u �Ǥ�, �����˿��ͤ�����, '<', '#' �� '%s' �����θ�ˤ��뤳�ȤϤ���ޤ���."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"̿���ֹ� %u �Ǥ�, �����˿��ͤ�����, '<', '#' �� '%s' �����θ�ˤ��뤳�ȤϤ�"
+"��ޤ���."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "���� {%u} ���Ф�������λ��꤬ '%s' �Τ褦�� '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "'%s' �� '%s' �Ǥΰ��� {%u} ���Ф�������λ��꤬Ʊ���ǤϤ���ޤ���"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
 msgstr "ʸ����ϰ����ֹ� %u �򻲾Ȥ��Ƥ��ޤ������� %u �� %u ��̵�뤷�Ƥ��ޤ�."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "���� %u �� %u ���Ф�������λ��꤬ '%s' ��¸�ߤ���, 1�Ĥΰ���������̵�뤵��Ƥ��뤫�⤷��ޤ���"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"���� %u �� %u ���Ф�������λ��꤬ '%s' ��¸�ߤ���, 1�Ĥΰ���������̵�뤵���"
+"���뤫�⤷��ޤ���"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -715,14 +755,24 @@ msgstr "��ʸ������Υ��顼: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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' ���Υѥ�᡼�������ꤵ��Ƥ��ޤ���."
+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' ���Υѥ�᡼�������ꤵ"
+"��Ƥ��ޤ���."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "̿���ֹ� %u �Ǥ�, ���ꤵ�줿�ѥ�᡼����¿�����ޤ�: �ѥ�᡼���Ϻ���Ǥ� %u �ĤǤ�."
+msgid ""
+"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."
+msgstr[0] ""
+"̿���ֹ� %u �Ǥ�, ���ꤵ�줿�ѥ�᡼����¿�����ޤ�: �ѥ�᡼���Ϻ���Ǥ� %u "
+"�ĤǤ�."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -752,7 +802,9 @@ msgstr "̿���ֹ� %u �Ǥ�, @ �� : ��ξ���ν����Ҥ����ꤵ��Ƥ��ޤ�."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr "̿���ֹ� %u �Ǥ�, '~:[' �θ�� '~;' ��ʬ����줿 2�Ĥ��᤬����ޤ���."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
@@ -775,14 +827,16 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "'%s' �Ǥη����λ��꤬ '%s' �ǤΥ��֥��åȤǤϤ���ޤ���"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
 msgstr "̿���ֹ� %u �Ǥ�, ������������Ѵ����� '%c' �ȸߴ��ǤϤ���ޤ���."
 
 #: src/format-python-brace.c:138
@@ -802,7 +856,8 @@ msgstr "̿���ֹ� %u �Ǥ�, '%c' �� getitem �ΰ�����Ϥ���뤳�Ȥ��Ǥ��ޤ���."
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "̿���ֹ� %u �Ǥ�, �ե����ޥåȼ��̻ҤǤ���ʾ�Υͥ��ȤϤǤ��ޤ���."
 
 #: src/format-python-brace.c:278
@@ -811,8 +866,11 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "̿���ֹ� %u ��, ��üʸ���Τʤ��ե����ޥå�̿�᤬����ޤ�."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "ʸ�����, ̾���Τ��������, ̾���ʤ��ΰ�����, �ɤ���ΰ����⻲�Ȥ��Ƥ��ޤ�."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"ʸ�����, ̾���Τ��������, ̾���ʤ��ΰ�����, �ɤ���ΰ����⻲�Ȥ��Ƥ��ޤ�."
 
 #: src/format-python.c:354
 #, c-format
@@ -821,112 +879,133 @@ msgstr "ʸ�������ߴ�����ˡ�ǰ���̾ '%s' �򻲾Ȥ��Ƥ��ޤ�."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "'%s' �Ǥη�������ϥޥåԥ󥰤Ǥ���, '%s' �Ǥϥ��ץ� (tuple) �Ǥ�"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "'%s' �Ǥη�������ϥ��ץ� (tuple) �Ǥ���, '%s' �Ǥϥޥåԥ󥰤Ǥ�"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "���� '%s' ���Ф���������꤬ '%s' �Τ褦�� '%s' ��¸�ߤ��ޤ���"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "���� '%3$s' ���Ф��� '%1$s' �� '%2$s' �Ǥη������꤬Ʊ���ǤϤ���ޤ���"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' ��ñ��ʥե����ޥå�ʸ����Ǥ���, '%s' �ϰ㤤�ޤ�. 'L' �ե饰�� 2��ο��Ͱ�����ޤߤޤ�"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' ��ñ��ʥե����ޥå�ʸ����Ǥ���, '%s' �ϰ㤤�ޤ�. 'L' �ե饰�� 2��ο�"
+"�Ͱ�����ޤߤޤ�"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "ʸ�����̾�������������Ǥʤ��������ѿ��򻲾Ȥ��Ƥ��ޤ�."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "ʸ�����ʣ���ʥ������̤�ʸˡ��Ȥä��������ѿ��򻲾Ȥ��Ƥ��ޤ�. ����ʸˡ�Ϥ����Ǥϥ������ƥ������ͳ�Ǽ�������Ƥ��ޤ���."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"ʸ�����ʣ���ʥ������̤�ʸˡ��Ȥä��������ѿ��򻲾Ȥ��Ƥ��ޤ�. ����ʸˡ��"
+"�����Ǥϥ������ƥ������ͳ�Ǽ�������Ƥ��ޤ���."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "ʸ����ϥ�����ؿ���ǰۤʤ��ǽ���Τ����ͤ���ä��������ѿ��򻲾Ȥ��Ƥ��ޤ�."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"ʸ����ϥ�����ؿ���ǰۤʤ��ǽ���Τ����ͤ���ä��������ѿ��򻲾Ȥ��Ƥ��ޤ�."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "ʸ�����̾�������Υ������ѿ��򻲾Ȥ��Ƥ��ޤ�."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "̿���ֹ� %u �Ǥ�, ʸ�� '%c' �� 1 ���� 9 �δ֤ο����ǤϤ���ޤ���."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "̿���ֹ� %u �ν�üʸ���� 1 ���� 9 �δ֤ο����ǤϤ���ޤ���."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "������¿�����ޤ�"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "����ˡ: %s [���ץ����]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "�ޥ���Υۥ���̾��ɽ��.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "���Ϸ���:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 û���ۥ���̾\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          Ĺ���ۥ���̾, FQDN (Fully Qualified Domain Name)\n"
+"  -f, --fqdn, --long          Ĺ���ۥ���̾, FQDN (Fully Qualified Domain "
+"Name)\n"
 "                                ����̾ (�����ꥢ��) ��ޤ�\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            �ۥ���̾���Ф��륢�ɥ쥹\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "�������:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "�ۥ���̾������Ǥ��ޤ���Ǥ���"
@@ -936,7 +1015,7 @@ msgstr "�ۥ���̾������Ǥ��ޤ���Ǥ���"
 msgid "selector is not specified"
 msgstr "���쥯���������ꤵ��Ƥ��ޤ���"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "XPath ����ƥ����Ȥ��뤳�Ȥ��Ǥ��ޤ���"
@@ -946,28 +1025,28 @@ msgstr "XPath ����ƥ����Ȥ��뤳�Ȥ��Ǥ��ޤ���"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "ɾ���Ǥ��ʤ� XPath ɽ��: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "\"%s\" �Ρ��ɤ� \"%s\" ��ޤߤޤ���"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "\"%2$s\" ���Ф���°���� \"%1$s\" ���ְ�äƤ��ޤ�"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "���Υ롼�����Ǥ�̾������ %s �β��Ǥ� \"rules\" �ǤϤ���ޤ���"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "%s ���ɤ߹���ޤ���: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "ɾ���Ǥ��ʤ� XPath �����������ѥ�: %s"
@@ -987,155 +1066,167 @@ msgstr "�ɤ߹���ʤ� XML �ե����� %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "���Υ롼�����Ǥ� \"locatingRules\" �ǤϤ���ޤ���"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "���� 1�Ĥ����ϥե����뤬������ޤ�"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �� %s ����ȿ�Ǥ�"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "����ˡ: %s [���ץ����] [���ϥե�����]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, 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:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "���ϥե�����λ���:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ���� PO �ե�����\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DIRECTORY   ���ϥե�����θ����ꥹ�Ȥ� DIRECTORY ���ɲ�\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DIRECTORY   ���ϥե�����θ����ꥹ�Ȥ� DIRECTORY ���ɲ�\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
+msgstr ""
+"���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "���ϥե�����λ���:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ���ꤷ���ե�����˽���\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ����Ϥ˷�̤��񤭽Ф���ޤ�.\n"
+msgstr ""
+"���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ����Ϥ˷�̤��񤭽Ф����"
+"��.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "����������:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            �������줿��å�������Ĥ�, ̤��������\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            �������줿��å�������Ĥ�, ̤��������\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          ̤�����Υ�å�������Ĥ�, �������줿��Τ���\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          ̤�����Υ�å�������Ĥ�, �������줿��Τ��"
+"��\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' �ޡ����դ��Υ�å���������\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' �ޡ����դ��Υ�å�������Ĥ�\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �Ѥ줿 #~ ��å���������\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         �Ѥ줿 #~ ��å�������Ĥ�\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "°�����:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ���ƤΥ�å������� 'fuzzy' ������\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           ���ƤΥ�å������� '�� fuzzy' ������\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ���ƤΥ�å������� '�Ѥ줿' ���֤�����\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        ���ƤΥ�å��������� '�Ѥ줿' ���֤�����\n"
+msgstr ""
+"      --clear-obsolete        ���ƤΥ�å��������� '�Ѥ줿' ���֤�����\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1144,186 +1235,214 @@ msgstr ""
 "      --previous              'fuzzy'�����ꤹ���, �������줿��å�������\n"
 "                              ���� msgid ��Ĥ�\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        ���ƤΥ�å��������� \"���� msgid\" ����\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        ���ƤΥ�å��������� \"���� msgid\" ����\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr "      --empty                 'fuzzy' ������ msgstr ���������\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     FILE.po �ˤ��륨��ȥ�Τ߽���\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+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:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ��Ʊ��\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              --only-obsolete --clear-obsolete ��Ʊ��\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              --only-obsolete --clear-obsolete ��Ʊ��\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "���ϥե������ʸˡ:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸˡ\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
+"ˡ\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "���Ϥξܺ�:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 ��˥��顼��¾�Υƥ�����°����Ȥ�\n"
 "      --color=WHEN            WHEN �ʤ�Х��顼��¾�Υƥ�����°����Ȥ�.\n"
-"                              WHEN �� 'always', 'never', 'auto', �ޤ��� 'html'.\n"
+"                              WHEN �� 'always', 'never', 'auto', �ޤ��� "
+"'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
+msgstr ""
+"      --style=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ���Ǥ��äƤ� PO �ե������񤭽Ф�\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                ������������ .po �ե���������\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
+msgstr ""
+"      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                ��̩�� Uniforum ������ .po �ե���������\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                ��̩�� Uniforum ������ .po �ե���������\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties �ե���������\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    NeXTstep/GNUstep .strings �ե���������\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    NeXTstep/GNUstep .strings �ե���������\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ���ϥڡ�������������\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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"
+msgstr ""
+"      --no-wrap               ���ϥڡ����������Ĺ����å������Ԥ���Ԥ���"
+"��\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           �����Ȥ��줿���Ϥ�����\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          �ե�����ǽ��Ϥ򥽡���\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "����ˡ: %s [���ץ����] [���ϥե�����]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1345,23 +1464,23 @@ msgstr ""
 "������, �ե�����ΰ��֤Ϥ��Τޤ޻Ĥ���ޤ�. ������ --use-first �����ꤵ�줿\n"
 "���ˤ�, ����餬������줿�ǽ�� PO �ե�����Τ�Τ����Τޤ޻Ĥ���ޤ�.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ���ϥե�����\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1370,7 +1489,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      NUMBER ��꾯�ʤ��������������줿��å�����\n"
 "                              �����. ���ꤵ��ʤ�����ɸ���̵�¸�\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1379,7 +1498,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1388,26 +1507,29 @@ msgstr ""
 "  -u, --unique                --less-than=2 ��û�̷�. 1�Ĥ����ʤ���å�����\n"
 "                              �Τߤ�ɽ��\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸˡ\n"
+msgstr ""
+"      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
+"ˡ\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          ���ϤΥ��󥳡��ǥ���\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1416,32 +1538,33 @@ msgstr ""
 "      --use-first             �ơ��Υ�å������κǽ��ͭ����������Ȥ�\n"
 "                              ʣ����������ޡ������ʤ�\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=CATALOGNAME      �إå����ܤ� 'Language' ������\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "���Τ� 2�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "����ˡ: %s [���ץ����] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1459,83 +1582,86 @@ msgstr ""
 "���Τ˰��פ��Ƥ���Ľ꤬���Ĥ���ʤ�����, �����ޤ� (fuzzy) ������Ȥ���\n"
 "����ɤ����ǥ�å������������ޤ�.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      ����\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     �������ؤλ���\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "������:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     �����ޤ�������Ԥ�ʤ�\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             fuzzy (�����ޤ�) ���ܤ��θ\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      ̤�����Υ�å��������θ\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "���Υ�å�������̤�����Ǥ�"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "���Υ�å������������Ԥˤ���ӥ塼��ɬ�פǤ�"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "���Υ�å������ϻȤ��ޤ����������Ƥ��ޤ���..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...������������������Ƥ��ޤ�"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "���Υ�å������ϻȤ��ޤ��� %s �Ǥ��������Ƥ��ޤ���"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "�ٹ�: ���Υ�å������ϻȤ��ޤ���"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d �Ĥ���̿Ū���顼�����Ĥ���ޤ���"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "���ʤ��Ȥ� 2�ĤΥե��������ꤷ�ʤ���Ф����ޤ���"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1555,7 +1681,7 @@ msgstr ""
 "�����Ȥ�, ����餬������줿�ǽ�� PO �ե�����Τ�ΤΤߤ��Τޤ޻Ĥ���ޤ�.\n"
 "�ޤ��ե�����ΰ��֤����Ƥ� PO �ե����뤫�餽�Τޤ޻Ĥ���ޤ�.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1564,65 +1690,68 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           'msgid \"\"' ��ޤ���إå�����Ϥ��ʤ�\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           'msgid \"\"' ��ޤ���إå�����Ϥ��ʤ�\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "��������������ۤʤä�ʸ�����󥳡��ǥ��󥰤��Ѵ�.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "�Ѵ��о�:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ɸ��Υ��󥳡��ǥ��󥰤ϸ��ߤΥ�������Υ��󥳡��ǥ��󥰤Ǥ�.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                �������������\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           '#: filename:line' �ιԤ���Ϥ��ʤ�\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          '#: filename:line' �ιԤ��ݻ� (ɸ��)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ��̩�� Uniforum ���Ϸ���\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "���Τ� 1�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "����ˡ: %s [���ץ����] INPUTFILE\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1634,22 +1763,22 @@ msgstr ""
 "PO �ƥ�ץ졼�ȥե����� (���̤� xgettext �ˤ�ä�����) �Ǥ�. ̤�����Υ���ȥ�\n"
 "�� msgid ��Ʊ�������˳�����Ƥ��ޤ�.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ���Ϥ��� PO �ޤ��� POT �ե�����\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "���ޥ��̾������ޤ���"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "����ˡ: %s [���ץ����] ���ޥ�� [���ޥ�ɥ��ץ����]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1664,7 +1793,7 @@ msgstr ""
 "���ν��Ϥ� msgexec �ν��Ϥˤʤ�ޤ�. msgexec �ν�λ�����ɤ���������Ƥ�\n"
 "�Ф��줿�ץ������ν�λ�����ɤκ����ͤˤʤ�ޤ�.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1673,61 +1802,62 @@ msgstr ""
 "'0' �Ȥ������̤��Ȥ߹��ߥ��ޥ�ɤϺǸ�˥̥�ʸ�����դ�����������Ϥ��ޤ�.\n"
 "\"msgexec 0\" �ν��Ϥ� \"xargs -0\" �ؤ����Ϥ�Ŭ���Ƥ��ޤ�.\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "���ޥ������:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   ���ϤκǸ�˲��Ԥ��ɲ�\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ���Ϥ��� PO �ե�����\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "ɸ����Ϥؤν񤭽Ф������Ԥ��ޤ���"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "�ե��륿̾������ޤ���"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "���ʤ��Ȥ� 1�Ĥ� sed ������ץȤ���ꤷ�ʤ���Ф����ޤ���"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "����ˡ: %s [���ץ����] �ե��륿 [�ե��륿���ץ����]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "�����������������Ƥ������˥ե��륿��Ŭ��.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, 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 ""
-"FILTER �Ȥ��Ƥ�, ɸ�����Ϥ����������ɤ߼��, ��������������ɸ����Ϥؽ񤭽Ф�\n"
+"FILTER �Ȥ��Ƥ�, ɸ�����Ϥ����������ɤ߼��, ��������������ɸ����Ϥؽ񤭽�"
+"��\n"
 "Ǥ�դΥץ���������ꤹ�뤳�Ȥ��Ǥ��ޤ�.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "�ե��륿�����ϤȽ���:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1736,253 +1866,290 @@ msgstr ""
 "  --newline                   ���ϤκǸ�˲��Ԥ��ɲä�\n"
 "                                ���ϤκǸ夫����Ԥ���"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "FILTER �� 'sed' ��������� FILTER-OPTION:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     �¹Ԥ���륳�ޥ�ɤ� SCRIPT ���ɲ�\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
-msgstr "  -f, --file=SCRIPTFILE       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
+msgstr ""
+"  -f, --file=SCRIPTFILE       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       �ѥ����󥹥ڡ����μ�ưŪ��ɽ��������\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                �������������\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           �إå��Υ���ȥ�����������ݻ�\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "�ե��륿�ν��Ϥϲ��Ԥǽ�ü����Ƥ��ޤ���"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s �ؤΰ�����ñ��ζ��ڤ�ʸ���Ǥ���٤��Ǥ�"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "̵���ʥ���ǥ�����: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "%s �� %s ����ꤹ��������ϥե��������ꤷ�Ƥ��Ϥ����ޤ���"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s �ˤ� \"-d �ǥ��쥯�ȥ�\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s �ˤ� \"-l ��������\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s �ˤ� \"--template �ƥ�ץ졼��\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s �ˤ� \"-o �ե�����\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s �� %s �� %s �ˤ�������ȿ�Ǥ�"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s �� %s, %s �ޤ��� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "%s ���Ф��� ITS �롼��ξ�꤬�狼��ޤ���"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d �Ĥ�������å�����"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d �ĤΤ����ޤ�������"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �Ĥ�̤���Υ�å�����"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "����ˡ: %s [���ץ����] filename.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "�Х��ʥ��å���������������ʸ�������ε��Ҥ�������.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ���ϥե�����\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "���⡼��:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java �⡼��: Java ResourceBundle ���饹������\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java �⡼��: Java ResourceBundle ���饹������\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 --java ��Ʊ���� Java2 (JDK 1.2 �ʹ�) ����\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 --java ��Ʊ���� Java2 (JDK 1.2 �ʹ�) ����\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# resources �⡼��: .NET .resources �ե������"
+"����\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C# resources �⡼��: .NET .resources �ե����������\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
-
-#: src/msgfmt.c:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt �⡼��: Qt .qm �ե����������\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Desktop Entry �⡼��: .desktop �ե����������\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Desktop Entry �⡼��: .desktop �ե����������\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML �⡼��: XML �ե����������\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ��̩�� Uniforum �⡼�ɤ�ͭ����\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ����Ϥ˷�̤��񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALE          ��������̾. ����̾�⤷���� \"����̾_��̾\"\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE          ��������̾. ����̾�⤷���� \"����̾_��̾\"\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                .class �ե����������� .java �ե���������\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                .class �ե����������� .java �ե�������"
+"��\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIRECTORY                ���饹�ǥ��쥯�ȥ�γ��ؤδ��ܥǥ��쥯�ȥ�\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d DIRECTORY                ���饹�ǥ��쥯�ȥ�γ��ؤδ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳��\n"
-"�Ƿ����ޤ�. -d ���ץ�����ɬ�ܤǤ�. ���饹�ϻ��ꤵ�줿�ǥ��쥯�ȥ�ʲ���\n"
+"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳"
+"��\n"
+"�Ƿ����ޤ�. -d ���ץ�����ɬ�ܤǤ�. ���饹�ϻ��ꤵ�줿�ǥ��쥯�ȥ�ʲ�"
+"��\n"
 "�񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d DIRECTORY                ���������¸�� .dll �ե�����δ��ܥǥ��쥯�ȥ�\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DIRECTORY                ���������¸�� .dll �ե�����δ��ܥǥ��쥯��"
+"��\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1991,17 +2158,18 @@ msgstr ""
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .dll �ե�����ϥ�������˰�¸����̾�������\n"
 "���ꤵ�줿�ǥ��쥯�ȥ�Υ��֥ǥ��쥯�ȥ�˽񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d DIRECTORY                .msg ��å��������������δ��ܥǥ��쥯�ȥ�\n"
+msgstr ""
+"  -d DIRECTORY                .msg ��å��������������δ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2010,22 +2178,22 @@ msgstr ""
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ�˽�\n"
 "�Ф���ޤ�.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Desktop Entry �⡼�ɤΥ��ץ����:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         .desktop �ե������ƥ�ץ졼�Ȥ˻���\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                .po �ե�����δ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2034,55 +2202,61 @@ msgstr ""
 "  -kWORD, --keyword=WORD      �ɲå�����ɤȤ��� WORD �򸡺�\n"
 "  -k, --keyword               ɸ��Υ�����ɤϻȤ�ʤ�\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "-l, -o, ����� --template ���ץ�����ɬ�ܤǤ�. -D �����ꤵ�줿���, ����\n"
 "�ե�����ϥ��ޥ�ɥ饤�����������ˤ��Υǥ��쥯�ȥ꤫���ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML �⡼�ɤΥ��ץ����:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAME         ���ꤵ�줿 XML �����ǧ��\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         XML �ե������ƥ�ץ졼�Ȥ˻���\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "���ϥե�����β��:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 --check-format, --check-header, --check-domain\n"
+"  -c, --check                 --check-format, --check-header, --check-"
+"domain\n"
 "                              �ǻ��ꤵ������ƤΥ����å���Ԥʤ�\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
+msgstr ""
+"      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr "      --check-header          �إå����ܤ�¸�ߤ����Ƥ��ǧ\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2091,129 +2265,138 @@ msgstr ""
 "      --check-domain          �ɥᥤ��̿��� --output-file ���ץ����δ֤�\n"
 "                              ̷�⤬�ʤ��������å�\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   GNU msgfmt �� X/Open msgfmt �Ȥθߴ������ǧ\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   GNU msgfmt �� X/Open msgfmt �Ȥθߴ������ǧ\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
-msgstr "      --check-accelerators[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
+msgstr ""
+"      --check-accelerators[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             fuzzy (�����ޤ�) ���ܤ���Ϥ˻Ȥ�\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=NUMBER      ʸ����� NUMBER �Х��Ȥ�·���� (ɸ��: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=NUMBER      ʸ����� NUMBER �Х��Ȥ�·���� (ɸ��: %d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=BYTEORDER  ���ꤵ�줿�Х��ȥ�������32�ӥåȤο��ͤ�񤭽Ф�\n"
-"                                (ɸ��ϥץ�åȥե�����ˤ�� big �� little)\n"
+"      --endianness=BYTEORDER  ���ꤵ�줿�Х��ȥ�������32�ӥåȤο��ͤ�񤭽�"
+"��\n"
+"                                (ɸ��ϥץ�åȥե�����ˤ�� big �� "
+"little)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               �Х��ʥ�ե�����ϥϥå���ơ��֥��ޤޤʤ�\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               �Х��ʥ�ե�����ϥϥå���ơ��֥��ޤޤʤ�\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            �����˴ؤ������׾����ɽ��\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ���ǥ�٥��夲��\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "�ٹ�: PO �ե�����Υإå����ʤ�, �⤷���������Ǥ�\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "�ٹ�: ʸ�����åȤ��Ѵ�����ǽ���ޤ���\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "�ٹ�: PO �ե�����إå��������ޤ��Ǥ�\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "�ٹ�: msgfmt �ΰ����ΥС������ǤϤ����ǥ��顼�ˤʤ�ޤ�\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
+msgstr ""
+"�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "'�ɥᥤ�� %s' ̿���̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "���� 'msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "�����ޤ� (fuzzy) �� 'msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: �ٹ�: �������ե�����ˤ����ޤ� (fuzzy) ������������ޤ�"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ��¸�ߤ��ޤ���"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s ��¸�ߤ��ޤ����ɤ߹���ޤ���"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "���ץ���� '%c' �� 'J' �� 'K' �� 'T' �� 'C' �� 'X' �����ꤵ������˻Ȥ����ȤϤǤ��ޤ���"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"���ץ���� '%c' �� 'J' �� 'K' �� 'T' �� 'C' �� 'X' �����ꤵ������˻Ȥ����Ȥ�"
+"�Ǥ��ޤ���"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2222,7 +2405,7 @@ msgstr ""
 "���������������椫��, ���ꤵ�줿�ѥ�����˰��פ���, �⤷���ϻ��ꤵ�줿������\n"
 "���Υ������ե�����˴ޤޤ�����ƤΥ�å���������Ф��ޤ�.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2297,33 +2480,40 @@ msgstr ""
 "  -i, --ignore-case           ��ʸ����ʸ������̤��ʤ�\n"
 "  -v, --invert-match          �ɤ�������ˤ���פ��ʤ���å������Τߤ����\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           �����Ȥ��줿���Ϥ�����\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          �ե�����ǽ��Ϥ򥽡���\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "���ʤ��ϸ���˴ؤ��Τʤ��Ķ��ˤ��ޤ�. ABOUT-NLS �˵��Ҥ��줿�褦��\n"
 "�Ķ��ѿ� LANG ����ꤷ�Ƥ�������. �����������ƥ��Ȥ��뤳�Ȥ��Ǥ��ޤ�.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2334,57 +2524,61 @@ msgstr ""
 "--locale ���ץ����ǥ����������ꤹ�뤫, --output-file ���ץ�����\n"
 "���Ϥ��� .po �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s ������.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       ���Ϥ��� POT �ե�����\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "���ϥե����뤬���ꤵ��ʤ����ϥ����ȥǥ��쥯�ȥ�� POT �ե����뤬����\n"
 "����ޤ�. �⤷���ϥե����뤬 - �ʤ��ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      ���ꤵ�줿 PO �ե�����˽���\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"���ϥե����뤬���ꤵ��ʤ����, ���ϥե������ --locale ���ץ���󤫥桼����\n"
+"���ϥե����뤬���ꤵ��ʤ����, ���ϥե������ --locale ���ץ���󤫥桼��"
+"��\n"
 "������������˰�¸���ޤ�. �⤷ - �ʤ�з�̤�ɸ����Ϥ˽��Ϥ���ޤ�.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          �оݤȤʤ�������������\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         PO �ե����뤬��ư���������Ȳ���\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2392,12 +2586,12 @@ msgstr ""
 "1�İʾ�� .pot �ե�����򸫤Ĥ��ޤ���.\n"
 "--input ���ץ��������Ϥ��� .pot �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "�����ȥǥ��쥯�ȥ���ɤ߹��ߥ��顼"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2405,65 +2599,74 @@ msgstr ""
 "�����ȥǥ��쥯�ȥ�� .pot �ե����뤬���Ĥ���ޤ���Ǥ���.\n"
 "--input ���ץ��������Ϥ��� .pot �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s ���֥ץ���������, ��λ������ %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "�桼���������˴ؤ���ե����ɥХå��򤢤ʤ������뤳�Ȥ��Ǥ���褦��,\n"
 "��������å��������������ˤϤ��ʤ��� email ���ɥ쥹��ޤ�Ƥ�������.\n"
-"�ޤ������, ͽ�����̵���Ū�����꤬ȯ���������˴����Ԥ����ʤ���Ϣ��������\n"
+"�ޤ������, ͽ�����̵���Ū�����꤬ȯ���������˴����Ԥ����ʤ���Ϣ�������"
+"��\n"
 "�褦�ˤ���Ȥ�����Ū�⤢��ޤ�.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s �ѥå��������Ф������"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "2�Ĥΰۤʤä�ʸ�����å� \"%s\" �� \"%s\" �����ϥե�����ˤ���ޤ�"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "���ϥե����� '%s' ��ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
-#: src/msgl-cat.c:208
+#: 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' ��Υɥᥤ�� \"%1$s\" �ˤ�ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"���ϥե����� '%2$s' ��Υɥᥤ�� \"%1$s\" �ˤ�ʸ�����åȤ���ꤹ��إå�����"
+"������ޤ���"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "�оݤȤʤ�ʸ�����å� \"%s\" �ϲ������Τ��륨�󥳡��ǥ���̾�ǤϤ���ޤ���"
+msgstr ""
+"�оݤȤʤ�ʸ�����å� \"%s\" �ϲ������Τ��륨�󥳡��ǥ���̾�ǤϤ���ޤ���"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "�ٹ�: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2472,18 +2675,21 @@ msgstr ""
 "���ϥե�����ˤϰۤʤä����󥳡��ǥ��󥰤Υ�å��������ޤޤ�Ƥ��ޤ�.\n"
 "���Ϥ� UTF-8 ���Ѵ����ޤ�.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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"
+"�̤ν��ϥ��󥳡��ǥ��󥰤����򤹤���� --to-code ���ץ�����ȤäƤ�����"
+"��.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2493,11 +2699,12 @@ msgid ""
 msgstr ""
 "�ե����� %s �� %s ���󥳡��ǥ��󥰤��� %s ���󥳡��ǥ��󥰤ؤ��Ѵ���\n"
 "�����Ĥ��� msgid �� msgctxt ���ѹ����ޤ�.\n"
-"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥޤ�\n"
+"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥ�"
+"��\n"
 "�����������ɥե���������, UTF-8 �ǥ��󥳡��ɤ���Ƥ��뤳�Ȥ��ݾڤ��뤫\n"
 "�ɤ��餫�Ǥ�.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2510,12 +2717,12 @@ msgstr ""
 "'%s' �ν��Ϥ������ΤǤ����ǽ��������ޤ�.\n"
 "��ǽ�ʲ����:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2526,7 +2733,7 @@ msgstr ""
 "  ���θ� '%s' ��Ŭ��.\n"
 "  ���� 'msgconv' ��Ȥä� %s ���᤹.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2539,7 +2746,7 @@ msgstr ""
 "  ���θ� '%s' ��Ŭ��.\n"
 "  ���� 'msgconv' ��Ȥä� %s ���᤹.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2557,7 +2764,8 @@ msgstr "ʣ��ɽ��������ͤ����������ǽ��������ޤ�"
 #: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu �Ǥ���ʣ��ɽ���� %lu ��Ʊ�����٤��ͤ����������ǽ��������ޤ�"
+msgstr ""
+"nplurals = %lu �Ǥ���ʣ��ɽ���� %lu ��Ʊ�����٤��ͤ����������ǽ��������ޤ�"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
@@ -2568,7 +2776,9 @@ msgid "plural expression can produce integer overflow"
 msgstr "ʣ��ɽ�����������դ�򵯤�����ǽ��������ޤ�"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr "ʣ��ɽ�����黻�㳰, �����餯�������򵯤�����ǽ��������ޤ�"
 
 #: src/msgl-check.c:270
@@ -2614,36 +2824,42 @@ msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "�����������Ĥ��Υ�å������ˤ� %lu �Ĥ�ʣ����������ޤ�"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "��å��������������ˤ�ʣ����������������ޤ�. ������ \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" �Ȥ����إå�����ȥ꤬����ޤ���"
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"��å��������������ˤ�ʣ����������������ޤ�. ������ \"Plural-Forms: "
+"nplurals=INTEGER; plural=EXPRESSION;\" �Ȥ����إå�����ȥ꤬����ޤ���"
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
+msgstr ""
+"'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
 #: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid' �� 'msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' �� 'msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
+msgstr ""
+"'msgid' �� 'msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
 #: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' �� 'msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' �� 'msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "ʣ����������� GNU gettext �γ�ĥ�Ǥ�"
 
@@ -2655,7 +2871,8 @@ msgstr "msgstr �ˤϥ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ���"
 #: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
+msgstr ""
+"msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
 
 #: src/msgl-check.c:818
 #, c-format
@@ -2675,15 +2892,15 @@ msgstr "Unicode ������� ASCII �ξ�ά���� ('...')"
 msgid "space before ellipsis found in user visible strings"
 msgstr "�桼����������ʸ����˾�ά���椬���Ĥ������˥��ڡ���"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Unicode ������� ASCII �������������"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Unicode ������� ASCII �����������"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "Unicode ������� ASCII �ι��ݵ��� ('%c')"
@@ -2696,39 +2913,53 @@ msgstr "%s: ���Ϥ� \"%s\" ���󥳡��ǥ��󥰤ˤ�����ͭ���ǤϤ���ޤ���"
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: \"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ�����ޤ���"
+msgstr ""
+"%s: \"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��"
+"ȯ�����ޤ���"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "���ϥե������ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ���,iconv() �Ϥ����Ѵ���������Ƥ��ޤ���."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ���,"
+"iconv() �Ϥ����Ѵ���������Ƥ��ޤ���."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "\"%s\" ���� \"%s\" �ؤ��Ѵ�����ʣ, �����Ĥ��ΰۤʤä� msgid ���������ʤäƤ��ޤ�."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"\"%s\" ���� \"%s\" �ؤ��Ѵ�����ʣ, �����Ĥ��ΰۤʤä� msgid ���������ʤäƤ�"
+"�ޤ�."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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() �ʤ��Ǻ���Ƥ��ޤ�."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s �� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "�Хå����åץ�����"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2750,17 +2981,17 @@ msgstr ""
 "�Ĥ���ޤ�. ���Τ˰��פ��Ƥ���Ľ꤬���Ĥ���ʤ�����, �����ޤ� (fuzzy)\n"
 "������Ȥ��Ȥ���ɤ���̤�����Ǥ��礦. \n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      �Ť����������Ф��뻲������\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ���������������Ф��뻲��\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2769,7 +3000,7 @@ msgstr ""
 "  -C, --compendium=FILE       ��å������������ɲ�ʸ��\n"
 "                              1��ʾ���ꤵ����ǽ������\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2778,143 +3009,172 @@ msgstr ""
 "  -U, --update                def.po �򹹿�\n"
 "                              def.po �����˺ǿ��ǤǤ���в��⤷�ʤ�\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "�����⡼�ɤǤν��ϥե�����ξ��:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "��̤� def.po �˽��ᤵ��ޤ�.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        def.po �ΥХå����åפ����\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         �̾�ΥХå����å�����������\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"�С�������������ˡ�� --backup ���ץ����, �⤷���ϴĶ��ѿ� VERSION_CONTROL\n"
+"�С�������������ˡ�� --backup ���ץ����, �⤷���ϴĶ��ѿ� "
+"VERSION_CONTROL\n"
 "������Ǥ��ޤ�. �����ͤϰʲ����̤�:\n"
 "  none, off       �Хå����åפ�������ʤ� (--backup �����ꤵ��Ƥ�)\n"
 "  numbered, t     �ֹ��դ��ΥХå����åפ����\n"
-"  existing, nil   �ֹ��դ��Хå����åפ�������ֹ��դ�, �����Ǥʤ����ñ�����\n"
+"  existing, nil   �ֹ��դ��Хå����åפ�������ֹ��դ�, �����Ǥʤ����ñ���"
+"��\n"
 "  simple, never   ���ñ������ΥХå����åפ����\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "--suffix ��Ķ��ѿ� SIMPLE_BACKUP_SUFFIX �����ꤵ��Ƥ��ʤ����,\n"
 "�Хå����å��������� '~' �Ǥ�.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              �������줿��å����������� msgid ��Ĥ�\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              �������줿��å����������� msgid ��Ĥ�\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       �ʹԾ�����ɽ�����ʤ�\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��Ǥ�"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��ǤϤ���ޤ���"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%s %ld(������) + %ld(����) ���ɤ߹��� (�ޡ��� %ld, �����ޤ� %ld, ���� %ld, �˴� %ld).\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%s %ld(������) + %ld(����) ���ɤ߹��� (�ޡ��� %ld, �����ޤ� %ld, ���� %ld, ��"
+"�� %ld).\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " ��λ.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "����ˡ: %s [���ץ����] [�ե�����]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "�Х��ʥ��å��������������� Uniforum ������ .po �ե�������Ѵ�.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java �⡼��: ���Ϥ� Java ResourceBundle ���饹\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java �⡼��: ���Ϥ� Java ResourceBundle ����"
+"��\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C# resources �⡼��: ���Ϥ� .NET .resources �ե�����\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# resources �⡼��: ���Ϥ� .NET .resources "
+"�ե�����\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl �⡼��: ���Ϥ� tcl/msgcat .msg �ե�����\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    ���Ϥ��� .mo �ե�����\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java �⡼�ɤˤ��������ϥե�����ξ��:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳��\n"
+"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳"
+"��\n"
 "�Ƿ����ޤ�. ���饹�ξ��� CLASSPATH �ǻ��ꤵ��ޤ�.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# �⡼�ɤˤ��������ϥե�����ξ��:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2923,29 +3183,31 @@ msgstr ""
 "-l �� -d ���ץ�����ɬ��. .dll �ե�����ϥ�������˰�¸����̾�������\n"
 "���ꤵ�줿�ǥ��쥯�ȥ�Υ��֥ǥ��쥯�ȥ���֤���ޤ�.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl �⡼�ɤˤ��������ϥե�����ξ��:\n"
 
-#: src/msgunfmt.c:486
+#: 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"
+msgstr ""
+"-l �� -d ���ץ�����ɬ��. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ���֤����"
+"��.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                �������������\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                ��̩�� Uniforum �����ǽ���\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2966,17 +3228,20 @@ msgstr ""
 "�ǽ������������Ф���ޤ�. �ե�����ΰ��֤Ϥ��Τޤ޻Ĥ�ޤ�. --unique\n"
 "���ץ�����Ȥ��Ƚ�ʣ��̵�뤵��ޤ�.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              ��ʣ���Ƥ����ΤΤߤ�ɽ��\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                ͣ��Υ�å������Τߤ�ɽ����, ��ʣ��̵��\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                ͣ��Υ�å������Τߤ�ɽ����, ��ʣ��̵��\n"
 
-#: src/open-catalog.c:57 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 "<ɸ������>"
@@ -3037,27 +3302,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "��Ӥ��Ƥ��ʤ� #~ �λ���"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "'msgstr[]' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "'msgid_plural' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "'msgstr' �ιब����ޤ���"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "�ǽ��ʣ�������󥼥��κ���������ޤ�"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "ʣ�����˴ְ�ä�����������ޤ�"
@@ -3067,7 +3332,7 @@ msgstr "ʣ�����˴ְ�ä�����������ޤ�"
 msgid "too many errors, aborting"
 msgstr "���顼��¿�᤮��Τ�, �������Ǥ��ڤ�ޤ�"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "������ʣ���Х��ȤΥ�������"
@@ -3077,41 +3342,41 @@ msgstr "������ʣ���Х��ȤΥ�������"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "�ե����뽪ü���Դ�����ʣ���Х��ȤΥ�������"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "�������Դ�����ʣ���Х��ȤΥ�������"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv ���"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "������� \"%s\" ���Τ�ޤ���"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "���������楷������"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "ʸ������� end-of-file"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "ʸ������� end-of-line"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "ʸ�������ʸ̮���ѥ졼�� <EOT>"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���Υե�����ϥɥᥤ��̿���ޤ�Ǥ��ʤ��褦�Ǥ�"
@@ -3141,7 +3406,7 @@ msgstr "\"%s\" �θ�� '=' ������ޤ���"
 msgid "invalid non-blank line"
 msgstr "��������֥�󥯹�"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "�ե����� \"%s\" ��û���ڤ�ΤƤ��Ƥ��ޤ�"
@@ -3151,29 +3416,45 @@ msgstr "�ե����� \"%s\" ��û���ڤ�ΤƤ��Ƥ��ޤ�"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "�ե����� \"%s\" �Ͻ�ü�� NUL �Ǥʤ�ʸ�����ޤ�Ǥ��ޤ�"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "�ե����� \"%s\" �Ͻ�ü�� NUL �Ǥʤ�ʸ�����ޤ�Ǥ��ޤ�"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "�ե����� \"%s\" �� GNU �� .mo �����ǤϤ���ޤ���"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "�ե����� \"%s\" �� %s �˽�ü�� NUL �Ǥʤ�ʸ�����ޤ�Ǥ��ޤ�"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "�ٹ�: Unicode ʸ�����Ф��������� \\uxxxx ʸˡ"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: �ٹ�: Ĺ������������ U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "�ٹ�: ������ Unicode ʸ��"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "�ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "�ٹ�: ʸˡ���顼"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "�ٹ�: ����/�ͤ��Ȥ˽�ü������ޤ���"
 
@@ -3181,11 +3462,11 @@ msgstr "�ٹ�: ����/�ͤ��Ȥ˽�ü������ޤ���"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "�ٹ�: ʸˡ���顼, ʸ����θ�ˤ� ';'"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "�ٹ�: ʸˡ���顼, ʸ����θ�ˤ� '=' �ޤ��� ';'"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "��� %s �� %s.\n"
@@ -3194,16 +3475,16 @@ msgstr "��� %s �� %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recode Serbian �ƥ����� �����ʸ�������ƥ�ʸ��.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3212,27 +3493,29 @@ msgstr ""
 "���ϥƥ����Ȥ�ɸ�����Ϥ����ɤ߹��ޤ�ޤ�. �Ѵ����줿�ƥ����Ȥ�ɸ����Ϥؽ���\n"
 "����ޤ�.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "���Ϥ� \"%s\" ���󥳡��ǥ��󥰤ˤ�����ͭ���ǤϤ���ޤ���"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "\"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ�����ޤ���"
+msgstr ""
+"\"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ��"
+"���ޤ���"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "������ 2�ĤǤ�"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "����ˡ: %s [���ץ����] URL �ե�����\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3241,111 +3524,137 @@ msgstr ""
 "URL �����Ƥ���������Ϥ��ޤ�. �⤷���� URL �˥��������Ǥ��ʤ����,\n"
 "��������˥���������ǽ�� FILE ������˻Ȥ��ޤ�.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "ɸ����Ϥ˽񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" ���ɤ߹������˥��顼��ȯ�����ޤ���"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "%s �򸡺���..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " �����ॢ����.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " ����.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "ʣ���������ɥᥤ�����ꤵ�줿���Ϸ�����ñ��Υե�����˽��Ϥ��뤳�ȤϤǤ��ޤ���. ����� PO �ե������ʸˡ��ȤäƤߤƤ�������."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"ʣ���������ɥᥤ�����ꤵ�줿���Ϸ�����ñ��Υե�����˽��Ϥ��뤳�ȤϤǤ���"
+"����. ����� PO �ե������ʸˡ��ȤäƤߤƤ�������."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "ʣ���������ɥᥤ�����ꤵ�줿���Ϸ�����ñ��Υե�����˽��Ϥ��뤳�ȤϤǤ��ޤ���."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"ʣ���������ɥᥤ�����ꤵ�줿���Ϸ�����ñ��Υե�����˽��Ϥ��뤳�ȤϤǤ���"
+"����."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "��å��������������ˤ�ʸ̮��¸������������ޤ���, ���Ϸ����Ϥ�����������Ƥ��ޤ���."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"��å��������������ˤ�ʸ̮��¸������������ޤ���, ���Ϸ����Ϥ������������"
+"���ޤ���."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "��å��������������ˤ�ʣ����������������ޤ�. ���������Ϸ����Ϥ����������Ƥ��ޤ���. °���ե����������� \"msgfmt --java\" ��Ȥä� Java ���饹���������ƤߤƤ�������."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"��å��������������ˤ�ʣ����������������ޤ�. ���������Ϸ����Ϥ�����������"
+"���ޤ���. °���ե����������� \"msgfmt --java\" ��Ȥä� Java ���饹������"
+"���ƤߤƤ�������."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "��å��������������ˤ�ʣ����������������ޤ���, ���Ϸ����Ϥ�����������Ƥ��ޤ���."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"��å��������������ˤ�ʣ����������������ޤ���, ���Ϸ����Ϥ�����������Ƥ�"
+"�ޤ���."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "���ϥե����� \"%s\" ���뤳�Ȥ��Ǥ��ޤ���"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "ɸ�����"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "�ǥ��쥯�ȥ� \"%s\" �κ����˼��Ԥ��ޤ���"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# ���饹�Υ���ѥ���˼���. --verbose ���Ƥ�������"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "C# ���饹�Υ���ѥ���˼���"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "������ Java ���饹̾�ǤϤ���ޤ���: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
+msgstr ""
+"Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Java ���饹�Υ���ѥ���˼���. $JAVAC �����ꤷ�ƤߤƤ�������"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "�Դ�����ʣ���Х��ȤΥ�������"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "��ݲ����줿��å������� '\\%c' �Ȥ������������ץ������󥹤�ޤ�ǤϤ����ޤ���"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"��ݲ����줿��å������� '\\%c' �Ȥ������������ץ������󥹤�ޤ�ǤϤ����ޤ�"
+"��"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3359,7 +3668,7 @@ msgstr ""
 "��Ƥ���Ƥ�������.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3383,11 +3692,13 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ���\n"
+"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ�"
+"��\n"
 "Qt ��å�����������������������ʸ����ǤΤ� Unicode �������, ����ʸ����\n"
 "�Ǥϼ������Ƥ��ޤ���.\n"
 
@@ -3398,15 +3709,16 @@ msgid ""
 "strings, not in the untranslated strings\n"
 msgstr ""
 "��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgid ʸ���󤬤���ޤ���\n"
-"Qt ��å�����������������������ʸ����ǤΤ� Unicode �������, ��������ʸ����\n"
+"Qt ��å�����������������������ʸ����ǤΤ� Unicode �������, ��������ʸ��"
+"��\n"
 "�Ǥϼ������Ƥ��ޤ���.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s ���֥ץ������ؤν񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3414,7 +3726,7 @@ msgstr ""
 "��å��������������ˤ�ʸ̮��¸������������ޤ�.\n"
 "������ C# .resources ������ʸ̮��������Ƥ��ޤ���\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3422,7 +3734,7 @@ msgstr ""
 "��å��������������ˤ�ʣ����������������ޤ�.\n"
 "������ C# .resources ������ʣ�����ν�����������Ƥ��ޤ���\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3430,7 +3742,7 @@ msgstr ""
 "��å��������������ˤ�ʸ̮��¸������������ޤ�.\n"
 "������ Tcl ��å�������������������ʸ̮��������Ƥ��ޤ���\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3438,36 +3750,56 @@ msgstr ""
 "��å��������������ˤ�ʣ����������������ޤ�.\n"
 "������ Tcl ��å�������������������ʣ�����ν�����������Ƥ��ޤ���\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: �ٹ�: ����ɽ���˽�ü������ޤ���"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "�ٹ�: ������ Unicode ʸ��"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: �ٹ�: ������ Unicode ʸ��"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �ٹ�: ʸ������˽�ü������ޤ���"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3476,7 +3808,7 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3485,7 +3817,7 @@ msgstr ""
 "%s:%d: Ĺ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3494,7 +3826,7 @@ msgstr ""
 "%s:%d: �ե�����κǸ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3503,12 +3835,12 @@ msgstr ""
 "%s:%d: �����������ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ���"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3517,119 +3849,137 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: �ٹ�: ������ Unicode ʸ��"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: �ٹ�: ʸ��������˽�ü������ޤ���"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: �ٹ�: '}' ������٤��Ȥ����� ')' ������ޤ�"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: �ٹ�: ')' ������٤��Ȥ����� '}' ������ޤ�"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s' ��ͭ���ʥ��󥳡���̾�ǤϤ���ޤ���. ����� ASCII �����.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "��ʸ�����å� '%s' ���Τ�ޤ���"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "ʸ���Υ����� '%s' ���Τ�ޤ���"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing �Ͻ����褬ɸ����Ϥξ��ˤϻȤ��ޤ���"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext �ϸ������륭����ɤ��ʤ����ư���ޤ���"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "�ٹ�: ITS �롼��ե����� '%s' ������ޤ���"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "�ٹ�: ITS �롼��ե����� '%s' ������ޤ���. gettext �Υ��󥹥ȡ�����ǧ"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"�ٹ�: ITS �롼��ե����� '%s' ������ޤ���. gettext �Υ��󥹥ȡ�����ǧ"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "�ٹ�: �ե����� '%s' (��ĥ�� '%s') ��̤�Τη����ʤΤ� C ������ޤ�"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Ϳ����줿���ϥե����뤫��������ǽ��ʸ�������Ф��ޤ�.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAME   ���Ϥ� NAME.po ����� (message.po ������)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NAME   ���Ϥ� NAME.po ����� (message.po ������)\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           ���ꤵ�줿�ե�����˽���\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        �ǥ��쥯�ȥ� DIR �˥ե���������\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "���ϥե�������������:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAME         ���ꤵ�줿�����ǧ��\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ��û�̷�\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr "ɸ��Ǹ�������ϥե�����γ�ĥ�ҤǼ��̤���ޤ�.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3638,27 +3988,28 @@ msgstr ""
 "      --from-code=NAME           ���ϥե�����Υ��󥳡��ǥ���\n"
 "                                         (Python, Tcl, Glade �ʳ�)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ��Ǥ�, ���ϥե������ ASCII �Ȳ��ꤵ��ޤ�.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸�ߤ���ե�����ȥ�å���������\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, 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:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cTAG, --add-comments=TAG   TAG ���饭����ɹԤޤǤΥ�������ʬ��\n"
@@ -3666,7 +4017,7 @@ msgstr ""
 "  -c, --add-comments[=TAG]    ������ɹԤޤǤ����ƤΥ�������ʬ��\n"
 "                                ���ϥե�����������\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3677,7 +4028,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3688,245 +4039,193 @@ msgstr ""
 "                                (single-space �ޤ��� double-space, \n"
 "                                 ɸ��� single-space)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "������ꥪ�ץ����:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ���Ƥ�ʸ��������\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala �����)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (������: C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=WORD:ARG:FLAG    ������� WORD �ΰ����ο� ARG �����ʸ������Ф���\n"
+"      --flag=WORD:ARG:FLAG    ������� WORD �ΰ����ο� ARG �����ʸ�������"
+"����\n"
 "                              �ղåե饰\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala �����)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ���Ϥ��줿 ANSI C �ȥ饤����դ�ǧ��\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC �����)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=FILE              FILE ���� ITS �롼���Ŭ��\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (XML�١����θ���Τ�)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ �����)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ���ܺ٤ʥե����ޥå�ʸ�����ǧ�����\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties �ե���������\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               itstool �����Ȥ�񤭽Ф�\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          GNU �ץ��������Ȱʳ��Υ桼�������˽������ FSF ������ά\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          GNU �ץ��������Ȱʳ��Υ桼�������˽������ FSF "
+"������ά\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  �ѥå�����̾����Ϥ�����\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  �ѥå������С���������Ϥ�����\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  msgid �ΥХ�����ѥ��ɥ쥹������\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  msgid �ΥХ�����ѥ��ɥ쥹������\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[STRING], --msgstr-prefix[=STRING]  msgstr ���ܤ���Ƭ���� STRING �� \"\"\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  msgstr ���ܤ���Ƭ���� STRING �� "
+"\"\"\n"
 "                                �����\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[STRING], --msgstr-suffix[=STRING]  msgstr ���ܤ��������� STRING �� \"\"\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  msgstr ���ܤ��������� STRING �� "
+"\"\"\n"
 "                                �����\n"
 
-#: src/xgettext.c:2040
-#, 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:2165
-msgid "standard input"
-msgstr "ɸ������"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "%s%s ����ASCIIʸ��."
-
-#: src/xgettext.c:2334
+#: src/xgettext.c:1597
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s �ޤ��Ϥ���������ASCII������."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "%s%s ����ASCIIʸ����."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: �ٹ�: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "�ե����ޥå�ʸ����ΰ��֤ǻȤ��Ƥ��ޤ���, %s �������� %s �ե����ޥå�ʸ����ǤϤ���ޤ���. ��ͳ: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ���. ��ͳ: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"̵̾�������Τ��� '%s' �ե����ޥå�ʸ�����Ŭ�ڤ����ꤹ�뤳�Ȥ��Ǥ��ޤ���:\n"
-"�����Ԥϰ����ν�����Ѥ��뤳�Ȥ��Ǥ��ޤ���.\n"
-"̾���դ������Τ���ե����ޥå�ʸ�����Ȥ�����, ��İ������Ф����� (tuple)\n"
-"������˥ޥåԥ󥰤�Ȥ����Ȥ�Ƥ���Ƥ�������.\n"
-
-#: src/xgettext.c:2545
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"���� msgid. GNU gettext ��ͽ�󤵤�Ƥ��ޤ�:\n"
-"gettext(\"\") �ϥ᥿������դ����إå�����ȥ���֤��ޤ���\n"
-"����ʸ������֤��ޤ���.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "������� '%.*s' ���Ф���������꤬ۣ��Ǥ�"
+"--flag ������ <keyword>:<argnum>:[pass-]<flag> ʸˡ����äƤ��ޤ���: %s"
 
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "�ٹ�: ������� '%.*s' ���Ф���ʸ̮������ޤ���"
-
-#: src/xgettext.c:3334
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "�ٹ�: ������� '%.*s' ��ʣ����������ʸ̮������ޤ���"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "ʸ̮��ñ���Ϥ�ʣ�����ǰ��פ��ޤ���"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "ɸ������"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3934,24 +4233,20 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 "���ץ���� --msgid-bugs-address �����ꤵ��Ƥ��ޤ���.\n"
-"'Makevars' �ե������ȤäƤ������ MSGID_BUGS_ADDRESS �ѿ�����ꤷ�Ƥ�������.\n"
+"'Makevars' �ե������ȤäƤ������ MSGID_BUGS_ADDRESS �ѿ�����ꤷ�Ƥ�����"
+"��.\n"
 "�⤷����, ���ޥ�ɥ饤�󥪥ץ���� --msgid-bugs-address ����ꤷ�Ƥ�������.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "���� '%s' ���Τ�ޤ���"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: �ٹ�: Ĺ������������ U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3960,7 +4255,7 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3969,7 +4264,7 @@ msgstr ""
 "%s:%d: Ĺ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3978,7 +4273,7 @@ msgstr ""
 "%s:%d: �ե�����κǸ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3987,7 +4282,7 @@ msgstr ""
 "%s:%d: �����������ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3996,145 +4291,202 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: �ٹ�: RegExp ��ƥ��ν�ü����᤮�ޤ�"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: �ٹ�: %s �ϵ��Ĥ���Ƥ��ޤ���"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: �ٹ�: ��ü�Τʤ� XML �ޡ������å�"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF �����Τɤ��ˤ�ʸ����ü \"%s\" �����Ĥ���ޤ���"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} �˱���̤�����ޤ���"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\l\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\u\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" ���������ѿ����"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\L\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\U\") 8bit ʸ�� \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: ̵���ʥޥ���Х��ȥ�������.\n"
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ĺ���Դ����ʥޥ���Х��ȥ�������.\n"
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: �ե�����κǸ���Դ����ʥޥ���Х��ȥ�������.\n"
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: �������Դ����ʥޥ���Х��ȥ�������.\n"
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: ̵���ʥޥ���Х��ȥ�������.\n"
-"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳����"
+"��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "̤�ΤΥ��󥳡��ǥ��� \"%s\". ����� ASCII �Ȥ��ƿʤ�ޤ�."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ������ʸ�������"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # �θ�˿���������ޤ���"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ������ʸ����ɽ��"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ������ʸ�������"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ������ʸ�������"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: �ٹ�: ʸˡ $\"...\" �ϥ������ƥ������ͳ�ǿ侩����ޤ���. ����� eval_gettext ��ȤäƤ�������"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: �ٹ�: ʸˡ $\"...\" �ϥ������ƥ������ͳ�ǿ侩����ޤ���. ����� "
+"eval_gettext ��ȤäƤ�������"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: �ٹ�: ����ɽ����ƥ��ν�ü����᤮�ޤ�"
@@ -4265,5 +4617,104 @@ msgstr "�����Ȥޤ��Ͻ���̿�����"
 msgid "document ended unexpectedly: %s"
 msgstr "ʸ�����곰�˽�λ: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ���ץ���� '--%s' �˰����Ϥ���ޤ���\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ���ץ���� `--%s' ���Բ�\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: ���ץ���� '-W %s' ��ۣ��Ǥ�\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: ���ץ���� '-W %s' �˰����Ϥ���ޤ���\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: ���ץ���� '-W %s' �ˤϰ�����ɬ�פǤ�\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "�ٹ�: PO �ե�����إå��������ޤ��Ǥ�\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "�ٹ�: msgfmt �ΰ����ΥС������ǤϤ����ǥ��顼�ˤʤ�ޤ�\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "%s%s ����ASCIIʸ��."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "%s%s �ޤ��Ϥ���������ASCII������."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "%s%s ����ASCIIʸ����."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: �ٹ�: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "�ե����ޥå�ʸ����ΰ��֤ǻȤ��Ƥ��ޤ���, %s �������� %s �ե����ޥå�ʸ"
+#~ "����ǤϤ���ޤ���. ��ͳ: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ�"
+#~ "��. ��ͳ: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "̵̾�������Τ��� '%s' �ե����ޥå�ʸ�����Ŭ�ڤ����ꤹ�뤳�Ȥ��Ǥ��ޤ�"
+#~ "��:\n"
+#~ "�����Ԥϰ����ν�����Ѥ��뤳�Ȥ��Ǥ��ޤ���.\n"
+#~ "̾���դ������Τ���ե����ޥå�ʸ�����Ȥ�����, ��İ������Ф����� "
+#~ "(tuple)\n"
+#~ "������˥ޥåԥ󥰤�Ȥ����Ȥ�Ƥ���Ƥ�������.\n"
+
+#~ 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 ""
+#~ "���� msgid. GNU gettext ��ͽ�󤵤�Ƥ��ޤ�:\n"
+#~ "gettext(\"\") �ϥ᥿������դ����إå�����ȥ���֤��ޤ���\n"
+#~ "����ʸ������֤��ޤ���.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "������� '%.*s' ���Ф���������꤬ۣ��Ǥ�"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "�ٹ�: ������� '%.*s' ���Ф���ʸ̮������ޤ���"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr "�ٹ�: ������� '%.*s' ��ʣ����������ʸ̮������ޤ���"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "ʸ̮��ñ���Ϥ�ʣ�����ǰ��פ��ޤ���"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
 #~ msgstr "�롼������ <%s> ��ͭ���� CLDR �ե����������뤳�ȤϤǤ��ޤ���"
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index 80d929f43..b3fa041de 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-05 08:30+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
@@ -17,19 +17,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 잘못되었습니다"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 애매합니다"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "올바른 인자는 다음과 같습니다:"
 
@@ -57,201 +58,184 @@ msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s에 대한 권한 보존"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "읽으려고 %s 파일을 여는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "%s 백업 파일을 위해 열지 못했습니다"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "%s 파일을 읽는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "%s 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "%s 파일을 읽은 후에 오류 발생"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen()이 실패했습니다"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C# 컴파일러가 없습니다. pnet을 설치해 보십시오"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C# 가상기계가 없습니다. pnet을 설치해 보십시오"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 하위 프로세스가 실패했습니다"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: '%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: '%s' 옵션은 모호한 옵션입니다. 가능한 옵션은:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: '%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: '--%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 인식할 수 없는 옵션 '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 부적절한 옵션 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니다"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class에 대한 target_version 인자가 잘못되었습니다"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\"을(를) 만드는 데 실패했습니다"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "자바 컴파일러가 없습니다. gcj를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
+msgstr ""
+"자바 컴파일러가 없습니다. gcj를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
+msgstr ""
+"자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 하위 프로세스 입출력 오류"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "스레드 만들기에 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s 하위 프로세스에서 읽기에 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "%s 하위 프로세스에 넌블로킹 입출력을 준비할 수 없습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s 하위 프로세스에 통신이 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 하위 프로세스가 종료 코드 %d번으로 끝났습니다"
@@ -275,13 +259,13 @@ msgstr "%s 하위 프로세스가 종료 코드 %d번으로 끝났습니다"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
@@ -290,66 +274,71 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "%s에 대한 권한 설정"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "파이프를 만들 수 없습니다"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 실패"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "파일 디스크립터 %d번을 복구할 수 없습니다: dup2 실패"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s 하위 프로세스"
 
 # fatal signal 번역 개선
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 하위 프로세스가 치명적인 시그널 %d번을 받았습니다"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "루트 엘리먼트는 <%s>이(가) 되어야 합니다"
 
 # XML 엘리먼트를 말한다
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "<%s> 엘리먼트에 <%s> 엘리먼트가 들어있지 않습니다"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "<%s> 엘리먼트에 <%s> 속성이 없습니다"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "사용법: %s [옵션...] [로캘 규칙]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -364,7 +353,7 @@ msgstr ""
 "복수형 규칙을 읽어서 gettext에 사용하기 적합한 형태로 출력합니다.\n"
 "인자를 지정하지 않으면, 표준 입력에서 CLDR 복수형 규칙을 읽습니다.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,27 +362,27 @@ msgstr ""
 "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 "없어도 되는 인자도 마찬가지입니다.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  CLDR 형식으로 복수 규칙을 표시합니다\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  이 도움말을 보여주고 끝납니다\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
@@ -402,25 +391,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -429,77 +423,78 @@ 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/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s이(가) 만들었습니다.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "다이키 우에노"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s을(를) 읽을 수 없습니다"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "%s에 대한 규칙을 추출할 수 없습니다"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "CLDR 규칙을 파싱할 수 없습니다"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "추가 피연산자 %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "읽으려고 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안에 있는, 인자 %1$u에 대한 서식 지정이 '%3$s'에 없습니다"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "'%s'과(와) '%s'에 쓰인 인자 %u에 대한 서식 지정이 같지 않습니다"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "지시자 %u번이 |로 시작하지만 |로 끝나지 않습니다."
@@ -507,58 +502,69 @@ msgstr "지시자 %u번이 |로 시작하지만 |로 끝나지 않습니다."
 #: src/format.c:152
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "'%3$s'와는 달리, '%1$s'은(는) 올바른 %2$s 형식 문자열이 아닙니다. 이유: %4$s"
+msgstr ""
+"'%3$s'와는 달리, '%1$s'은(는) 올바른 %2$s 형식 문자열이 아닙니다. 이유: %4$s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "지시자 %u번에서, '<' 뒤의 토큰이 포맷을 지정하는 매크로 이름이 아닙니다. 올바른 매크로 이름은 ISO C 99 섹션 7.8.1에 열거되어 있습니다."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"지시자 %u번에서, '<' 뒤의 토큰이 포맷을 지정하는 매크로 이름이 아닙니다. 올바"
+"른 매크로 이름은 ISO C 99 섹션 7.8.1에 열거되어 있습니다."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "지시자 %u번에서, '<' 뒤의 토큰 다음에 '>'가 오지 않습니다."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "문자열이 인자 번호  %u을(를) 참조하지만 인자 번호 %u을(를) 무시합니다."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'%s'과(와) '%s'에 쓰인 서식 지정자의 개수가 일치하지 않습니다"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "지시자 %u번에서, '{' 다음에 인자 번호가 오지 않습니다."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "지시자 %u번에서, 숫자 다음에 ','가 오지 않습니다."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "문자열이 지시자 중간에서 끝납니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"문자열이 지시자 중간에서 끝납니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "지시자 %u번이 '}'가 아니라 잘못된 '%c' 문자로 끝납니다."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "지시자 %u번이 '}'가 아니라 잘못된 문자로 끝납니다."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "지시자 중간에서 문자열이 시작합니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"지시자 중간에서 문자열이 시작합니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "문자열에 지시자 %u번 뒤에 '}'가 들어 있습니다."
@@ -575,12 +581,16 @@ msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자가 올 수 없습니�
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "지시자 %u번에서, 유효숫자에 대해 인자 개수가 %u와(과) 같아야 합니다."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자를 지정할 수 없습니다."
 
 #: src/format-gcc-internal.c:406
@@ -618,32 +628,45 @@ msgid "The string ends in the middle of a directive."
 msgstr "지시자 중간에서 문자열이 끝납니다."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "문자열이 인자의 절대 번호를 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조합니다."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"문자열이 인자의 절대 번호를 통한 방법과 이름없이 지정하는 방법 두 가지로 인자"
+"를 참조합니다."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "지시자 %u번에서, 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "지시자 %u번에서, 너비의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "지시자 %u번에서, 정밀도의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "지시자 %u번에서, '%c' 문자는 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "지시자 %u번을 끝마치는 문자가 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:40
@@ -651,60 +674,80 @@ msgstr "지시자 %u번을 끝마치는 문자가 올바른 변환 지정자가
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "문자열에서 호환되지 않는 방법으로 인자 번호 %u을(를) 참조합니다."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 날짜/시각 스타일이 아닙니다."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 날짜/시각 스타일이 아닙니다."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "지시자 %u번에서, \"%s\" 다음에 쉼표가 오지 않습니다."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 숫자 스타일이 아닙니다."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 숫자 스타일이 아닙니다."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-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\"중의 하나가 오지 않습니다."
+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\"중의 "
+"하나가 오지 않습니다."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "지시자 %u번에서, 선택 지정에 숫자가 들어 있지 않습니다."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "지시자 %u번에서, 선택 지정에 숫자 다음에 '<', '#', 혹은 '%s'이(가) 오지 않습니다."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"지시자 %u번에서, 선택 지정에 숫자 다음에 '<', '#', 혹은 '%s'이(가) 오지 않습"
+"니다."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안에 있는, 인자 {%1$u}에 대한 서식 지정이 '%3$s'에 없습니다"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "인자 {%3$u}에 대한 '%1$s'과(와) '%2$s'의 서식 지정이 같지 않습니다"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "문자열이 인자 번호  %u을(를) 참조하지만 인자 번호 %u 및 %u을(를) 무시합니다."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"문자열이 인자 번호  %u을(를) 참조하지만 인자 번호 %u 및 %u을(를) 무시합니다."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "인자 %u 및 %u에 대한 서식 지정이 '%s'에 없고, 인자 하나만 무시할 수 있습니다."
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"인자 %u 및 %u에 대한 서식 지정이 '%s'에 없고, 인자 하나만 무시할 수 있습니다."
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -715,14 +758,23 @@ msgstr "분석하는데 오류: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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' 타입이어야 합니다."
+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' 타입이어야 합니다."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "지시자 %u번에서, 매개변수가 너무 많습니다. 매개변수는 최대 %u개만 올 수 있습니다."
+msgid ""
+"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."
+msgstr[0] ""
+"지시자 %u번에서, 매개변수가 너무 많습니다. 매개변수는 최대 %u개만 올 수 있습"
+"니다."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -752,8 +804,12 @@ msgstr "지시자 %u번에서, @와 : 변경자가 모두 들어 있습니다."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "지시자 %u번에서, '~:[' 다음에 와야 하는 '~;'로 구분된 두 개의 절이 오지 않습니다."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"지시자 %u번에서, '~:[' 다음에 와야 하는 '~;'로 구분된 두 개의 절이 오지 않습"
+"니다."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -776,14 +832,16 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "'%s' 안에 있는 서식 지정이 '%s'에 없습니다"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
 msgstr "지시자 %u번에서, 크기 지정은 '%c' 변환 지정과 호환되지 않습니다."
 
 #: src/format-python-brace.c:138
@@ -803,7 +861,8 @@ msgstr "지시자 %u번에서, getitem 인자가 '%c' 문자로 시작할 수 �
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "지시자 %u번에서, 포맷 지정에서 더 이상은 네스팅을 허용하지 않습니다."
 
 #: src/format-python-brace.c:278
@@ -812,8 +871,12 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "지시자 %u번에서, 포맷 지시자를 마치지 않았습니다."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "문자열이 인자 이름을 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조합니다."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"문자열이 인자 이름을 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조"
+"합니다."
 
 #: src/format-python.c:354
 #, c-format
@@ -823,112 +886,131 @@ msgstr "문자열이 호환되지 않는 방법으로 '%s'(이)라는 이름의
 # mapping과 tuple: python 데이타 구조
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "'%s'의 서식 지정자는 매핑이 필요한데, '%s'에는 터플이 필요합니다"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "'%s'의 서식 지정자는 터플이 필요한데, '%s'에는 매핑이 필요합니다"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안에 있는, 인자 '%1$s'에 대한 서식 지정이 '%3$s'에 없습니다"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "인자 '%s'에 대한 '%s'과(와) '%s'의 서식 지정이 같지 않습니다"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s'은(는) 간단한 형식 문자열이지만 '%s' 문자열은 아닙니다: 'L' 플래그가 들어 있거나 인자 번호가 두 자리로 들어 있습니다."
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s'은(는) 간단한 형식 문자열이지만 '%s' 문자열은 아닙니다: 'L' 플래그가 들"
+"어 있거나 인자 번호가 두 자리로 들어 있습니다."
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "문자열이 ASCII가 아닌 이름으로 쉘 변수를 참조합니다."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "문자열이 복잡한 쉘 중괄호 문법으로 쉘 변수를 참조합니다. 이 문법은 보안상의 이유때문에 지원하지 않습니다."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"문자열이 복잡한 쉘 중괄호 문법으로 쉘 변수를 참조합니다. 이 문법은 보안상의 "
+"이유때문에 지원하지 않습니다."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr "문자열이 쉘 함수 안에서 다를 수도 있는 쉘 변수를 참조합니다."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "문자열이 빈 이름의 쉘 변수를 참조합니다."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "지시자 %u번에서, 문자 '%c'이(가) 1과 9 사이의 숫자가 아닙니다."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "브루노 헤이블(Bruno Haible)"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "인수가 너무 많음"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "사용법: %s [옵션]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "이 기계의 호스트이름을 표시합니다.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "출력 형식:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           짧은 호스트이름\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long    긴 호스트이름, 완전 공인 도메인이름(Fully Qualified\n"
 "                          Domain Name) 및 별명(alias)들을 모두 포함\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      호스트이름에 대한 주소\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "정보 출력:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "호스트이름을 알아낼 수 없습니다"
@@ -938,7 +1020,7 @@ msgstr "호스트이름을 알아낼 수 없습니다"
 msgid "selector is not specified"
 msgstr "셀렉터를 지정하지 않았습니다"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "XPath 컨텍스트를 만들 수 없습니다"
@@ -948,28 +1030,28 @@ msgstr "XPath 컨텍스트를 만들 수 없습니다"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "XPath 표현식을 확인할 수 없습니다: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "\"%s\" 노드에 \"%s\"이(가) 없습니다"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "\"%2$s\"에 대한 속성값 \"%1$s\"이(가) 잘못되었습니다"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "%s 네임스페이스에서 루트 엘리먼트가 \"rules\"가 아닙니다"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "%s을(를) 읽을 수 없습니다: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "XPath 위치 경로를 확인할 없습니다: %s"
@@ -989,88 +1071,91 @@ msgstr "%s XML 파일을 읽을 수 없습니다"
 msgid "the root element is not \"locatingRules\""
 msgstr "루트 엘리먼트가 \"locatingRules\"가 아닙니다"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "최대 한 개의 입력파일만이 허용됩니다"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s과(와) %s은(는) 서로 배타적입니다"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "사용법: %s [옵션] [입력파일]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, 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:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "입력 파일 위치:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  <입력파일>                     입력 PO 파일\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=<디렉터리>  입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=<디렉터리>  입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서 읽습니다.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "출력 파일 위치:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=<파일>   지정한 파일로 출력합니다\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1079,67 +1164,75 @@ msgstr ""
 "만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
 "출력합니다.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "메시지 선택:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            번역되었으면 놔 두고, 번역되지 않았으면 지웁니다\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            번역되었으면 놔 두고, 번역되지 않았으면 지웁니"
+"다\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          번역되지 않았으면 놔 두고, 번역되었으면 지웁니다\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          번역되지 않았으면 놔 두고, 번역되었으면 지웁니"
+"다\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy'로 표시된 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy'로 표시된 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           없어진 #~ 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         없어진 #~ 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "속성 조작:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니다\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
+msgstr ""
+"      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 만듭니다\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
+msgstr ""
+"      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1148,153 +1241,186 @@ msgstr ""
 "      --previous              'fuzzy'로 설정할 때, 이전에 번역한 메시지의\n"
 "                              msgid를 놔 둡니다\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr "      --empty                 'fuzzy'를 제거할 때, msgstr도 비웁니다\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=<파일>.po   <파일>.po에 들어 있는 항목만 조작합니다\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=<파일>.po   <파일>.po에 들어 있는 항목만 조작합니다\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
+msgstr ""
+"      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              \"--only-obsolete --clear-obsolete\"와 동일합니다\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              \"--only-obsolete --clear-obsolete\"와 동일합니"
+"다\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "입력 파일 문법:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니다\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
+"다\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "출력 상세:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 색이나 기타 텍스트 속성을 항상 사용합니다\n"
 "      --color=<상황>          색이나 기타 텍스트 속성을 <상황>에 사용합니다\n"
-"                              <상황>은 'always', 'never', 'auto', 혹은 'html'.\n"
+"                              <상황>은 'always', 'never', 'auto', 혹은 "
+"'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
+msgstr ""
+"      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않습니다\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
+"습니다\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              비어 있는 파일이라도 PO 파일로 씁니다\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                들여쓰기된 스타일로 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+msgstr ""
+"      --no-location           '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          '#: 파일_이름:줄번호' 줄을 만듭니다(기본값)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          '#: 파일_이름:줄번호' 줄을 만듭니다(기본값)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output     NeXTstep/GNUstep .strings 파일을 씁니다\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output     NeXTstep/GNUstep .strings 파일을 씁니다\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=<숫자>          출력 페이지의 너비를 지정합니다\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1303,31 +1429,31 @@ msgstr ""
 "      --no-wrap               출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
 "                              자르지 않습니다.\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           정렬된 출력을 만들어 냅니다\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "사용법: %s [옵션] [입력파일]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1349,23 +1475,23 @@ msgstr ""
 "나타나는 가장 첫 번째 PO 파일에 들어 있는 모든 PO 파일에서 파일 위치는 그대로\n"
 "유지됩니다.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  입력파일 ...                입력 파일\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=<파일>     입력 파일의 목록을 <파일>에서 읽습니다\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1374,7 +1500,7 @@ msgstr ""
 "  -<, --less-than=<크기>      지정한 것보다 적은 메시지만을 출력합니다.\n"
 "                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1383,7 +1509,7 @@ msgstr ""
 "  -<, --less-than=<크기>      지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1392,26 +1518,31 @@ msgstr ""
 "  -u, --unique                --less-than=2를 짧게 쓴 것입니다.\n"
 "                              유일한 메시지만을 출력합니다.\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습니다\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습"
+"니다\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니다\n"
+msgstr ""
+"      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
+"다\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=<이름>          출력의 인코딩\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1420,32 +1551,33 @@ msgstr ""
 "      --use-first               각 메시지중에서 첫번째로 나타나는 번역문만\n"
 "                                사용하고, 여러 번역문을 합치지 않습니다\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=<목록이름>       헤더에 'Language' 항목을 설정합니다\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "피터 밀러(Peter Miller)"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "정확히 2개의 입력 파일이 필요합니다"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "사용법: %s [옵션] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1462,83 +1594,87 @@ msgstr ""
 "메시지가 번역되었는지 확인할 때 유용합니다. 정확한 짝을 찾지 못할 경우, 보다\n"
 "나은 결과를 얻으려고 퍼지 매칭이 사용됩니다.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      번역문\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     소스를 참조\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "동작 변경:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     퍼지 매칭을 하지 않습니다\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             퍼지 항목을 사용합니다\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      번역하지 않은 항목을 사용합니다\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "이 메시지는 번역되지 않았습니다"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "이 메시지는 번역자의 검토가 필요합니다"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "이 메시지는 사용되지만 정의되지 않았습니다..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...하지만 이 정의는 유사합니다"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "경고: 이 메시지는 사용되지 않습니다"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "치명적인 오류 %d개를 찾았습니다"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "최소한 파일 두 개를 지정해야 합니다"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1557,7 +1693,7 @@ msgstr ""
 "주석문은 모두 유지될 것이지만, 정의하려면 첫 번째 PO 파일에서만 유지됩니다. 모든\n"
 "PO 파일에서 파일 위치는 누적됩니다.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1566,65 +1702,70 @@ msgstr ""
 "  ->, --more-than=<크기>         지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                                 이 옵션이 없을 경우에 기본값은 1입니다.\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           헤더에 'msgid \"\"' 항목을 쓰지 않습니다\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           헤더에 'msgid \"\"' 항목을 쓰지 않습니다\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "번역 목록을 다른 문자 인코딩으로 변환합니다.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "변환 목표:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                들여쓰기된 출력 형태\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+msgstr ""
+"      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "정확히 한 개의 입력 파일이 필요합니다"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "사용법: %s [옵션] <입력파일>\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1636,22 +1777,22 @@ msgstr ""
 "서식 파일입니다. (일반적으로 xgettext로 만듭니다.) 번역되지 않은 항목은\n"
 "msgid와 동일한 번역문이 할당되고, 퍼지로 표시됩니다.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  <입력파일>                   입력 PO 파일 혹은 POT 파일\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "명령어 이름이 빠졌습니다"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "사용법: %s [옵션] <명령어> [명령어-옵션]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1666,7 +1807,7 @@ msgstr ""
 "출력은 msgexec의 출력이 됩니다. 프로그램을 번역문마다 실행했을 때 가장 \n"
 "큰 리턴 코드가 msgexec의 리턴 코드가 됩니다.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1675,47 +1816,47 @@ msgstr ""
 "특별히 내부 명령어 '0'은 번역문을 그대로 출력하고, 맨 끝에 0 널 바이트를 \n"
 "출력합니다. \"msgexec 0\"의 출력물은 \"xargs -0\"의 입력으로 사용하기에 적합합니다\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "명령어 입력:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   입력 끝에 줄바꿈을 추가합니다\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=<입력파일>       입력 PO 파일\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "표준 출력에 쓰기가 실패했습니다"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "필터 이름이 빠졌습니다"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "최소한 한 개의 sed 스크립트를 지정해야 합니다"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "사용법: %s [옵션] <필터> [필터-옵션]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "번역 목록의 모든 번역문에 대하여 필터를 적용합니다.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1724,12 +1865,12 @@ msgstr ""
 "\"필터\"는 표준 입력에서 번역문을 읽어서 수정된 번역문을 표준 출력으로\n"
 "출력하는 프로그램이면 어떤 프로그램이든 가능합니다.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "필터 입력 및 출력:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1738,237 +1879,269 @@ msgstr ""
 "  --newline                   입력 끝에 줄바꿈을 추가하고\n"
 "                                출력 끝에 줄바꿈을 제거합니다"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=<스크립트파일>   <스크립트파일>의 내용을 실행할 명령어에\n"
 "                              추가합니다.\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       패턴 공백을 자동으로 출력하지 않도록 합니다\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       패턴 공백을 자동으로 출력하지 않도록 합니다\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           헤더 항목을 수정하지 않습니다. 필터링하지 않습니다.\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           헤더 항목을 수정하지 않습니다. 필터링하지 않습"
+"니다.\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "필터 출력이 줄바꿈으로 끝나지 않습니다"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s의 인자는 한 개의 구두점 문자여야 합니다"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "엔디안이 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "울리히 드레퍼(Ulrich Drepper)"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "%s 및 %s 옵션을 사용하면 입력 파일을 지정하지 않아야 합니다"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 옵션은 \"-d <디렉터리>\" 지정이 필요합니다"
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 옵션은 \"-d <로캘>\" 지정이 필요합니다"
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s 옵션은 \"--template <서식>\" 지정이 필요합니다"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s 옵션은 \"-o <파일>\" 지정이 필요합니다"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s 및 %s 옵션은 %s에서 서로 배타적입니다"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 옵션은 %s, %s 또는 %s 옵션과 함께 써야만 효과가 있습니다"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "%s에 대한 ITS 규칙을 찾을 수 없습니다"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "번역된 메시지 %d개"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", 퍼지 번역문 %d개"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", 번역되지 않은 메시지 %d개"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "사용법: %s [옵션] <파일이름>.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  <파일이름>.po ...             입력 파일\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "동작 모드:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니"
+"다\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니다\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 --java와 같지만, Java2를 가정합니다(JDK 1.2 이"
+"상)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 --java와 같지만, Java2를 가정합니다(JDK 1.2 이상)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니다\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니다\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# 리소스 모드: .NET .resources 파일을 만듭니"
+"다\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C# 리소스 모드: .NET .resources 파일을 만듭니다\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
-
-#: src/msgfmt.c:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               desktop 항목 모드: .desktop 파일을 만듭니다\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               desktop 항목 모드: .desktop 파일을 만듭니다\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML 모드: XML 파일을 만듭니다\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "자바 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=<리소스>     리소스 이름\n"
 
-#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr "  -l, --locale=<로캘>         로캘 이름, 언어 혹은 언어_국가\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr "      --source                .class 파일 대신 .java 파일을 만듭니다\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d <디렉터리>               클래스 디렉터리 구조의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1976,34 +2149,38 @@ msgstr ""
 "이름으로 결정됩니다. -d 옵션은 꼭 필요합니다. 클래스는 지정한 디렉터리\n"
 "아래에 출력됩니다.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr "  -d <디렉터리>               로캘 의존  .dll 파일의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, 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 "-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의(로캘에 따라 달라지는 이름의) 아래 디렉터리에 씁니다.\n"
+msgstr ""
+"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의(로캘에 따라 달라"
+"지는 이름의) 아래 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d <디렉터리>               .msg 메시지 목록의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2011,24 +2188,24 @@ msgid ""
 msgstr "-l과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리에 씁니다.\n"
 
 # freedesktop.org desktop을 말한다
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "desktop 항목 모드 옵션:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=<서식>           .desktop 파일을 서식으로 사용\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d <디렉터리>               .po 파일의 베이스 디렉터리\n"
 "\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2037,54 +2214,62 @@ msgstr ""
 "  -k<단어>, --keyword=<단어>     <단어>를 추가 키워드로 찾습니다\n"
 "  -k, --keyword                  기본 키워드를 사용하지 않습니다\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
-msgstr "-l, -o 및 --template 옵션은 필수입니다. -D 옵션을 사용하면 입력 파일을 명령행 대신 디렉터리에서 읽습니다.\n"
+msgstr ""
+"-l, -o 및 --template 옵션은 필수입니다. -D 옵션을 사용하면 입력 파일을 명령"
+"행 대신 디렉터리에서 읽습니다.\n"
 
 # freedesktop.org desktop을 말한다
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML 모드 옵션:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=<이름>       지정한 XML 언어를 인식합니다\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=<서식>           서식으로 사용하는 XML 파일\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "입력 파일 해석:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 --check-format, --check-header, \n"
-"                              --check-domain에서 하는 검사를 모두 수행합니다\n"
+"                              --check-domain에서 하는 검사를 모두 수행합니"
+"다\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          언어에 따라 포맷 문자열을 검사합니다\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          헤더 항목이 있는지와 그 내용을 검사합니다\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          헤더 항목이 있는지와 그 내용을 검사합니다\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2093,133 +2278,138 @@ msgstr ""
 "      --check-domain          도메인 지정과 --output-file 옵션의 도메인이\n"
 "                              충돌하지 않는지 검사합니다\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   GNU msgfmt이 X/Open의 msgfmt처럼 검사합니다\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   GNU msgfmt이 X/Open의 msgfmt처럼 검사합니다\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CHAR]  메뉴 항목에 키보드 단축글쇠가 있는지 \n"
 "                              검사합니다\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             출력에 퍼지 항목을 사용합니다\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=<크기>      문자열을 <크기> 바이트에 정렬합니다(기본값: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=<크기>      문자열을 <크기> 바이트에 정렬합니다(기본값: "
+"%d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=<바이트순> 32비트 수를 주어진 바이트 순서로 씁니다\n"
 "                                (big 또는 little, 기본값은 플랫폼에 따라)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               이진 파일에 해쉬 테이블을 넣지 않습니다\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               이진 파일에 해쉬 테이블을 넣지 않습니다\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            번역에 대한 통계를 표시합니다\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               더 자세히 출력합니다\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "경고: PO 파일 헤더가 빠졌거나 잘못되었습니다\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "경고: 문자셋 변환이 동작하지 않습니다\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "경고: PO 파일 헤더가 퍼지입니다\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "경고: 과거 버전의 msgfmt은 여기에 오류를 낼 것입니다\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "도메인 이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다. 그러므로 접두사를\n"
 "사용합니다"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "'domain %s' 지시자는 무시됨"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "빈 'msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "퍼지 'msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: 경고: 소스 파일에 퍼지 번역문이 들어 있습니다"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s 파일이 없습니다"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s 파일이 있지만 읽을 수 없습니다"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2228,7 +2418,7 @@ msgstr ""
 "번역 목록에서 주어진 패턴에 맞는 메시지 혹은 주어진 소스 파일에 들어 있는\n"
 "메시지만을 뽑아 냅니다.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2302,32 +2492,40 @@ msgstr ""
 "  -i, --ignore-case           대소문자 구별을 하지 않습니다\n"
 "  -v, --invert-match          지정한 옵션에 맞지 않는 메시지만을 출력합니다\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           정렬된 출력을 만듭니다\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          파일의 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "언어가 지정되지 않은 환경입니다. ABOUT-NLS 파일에 설명된 대로\n"
 "여러분의 LANG 환경변수를 세팅하십시오. 세팅해야만이 여러분의\n"
 "번역문을 테스트할 수 있습니다.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2338,38 +2536,39 @@ msgstr ""
 "--locale 옵션으로 로캘을 지정하거나 --output-file 옵션으로\n"
 "출력 .po 파일을 지정하십시오.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s을(를) 만들었습니다.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=<입력파일>       입력 POT 파일\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "만약 입력 파일이 주어지지 않으면, 현재 디렉터리에서 POT 파일을 찾습니다.\n"
 "입력 파일이 \"-\"이면, 표준 입력을 읽습니다.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=<파일>    지정한 PO 파일로 출력합니다\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2378,17 +2577,20 @@ msgstr ""
 "만약 출력 파일이 주어지지 않으면, --locale 옵션이나 사용자의 로캘 세팅에\n"
 "따라 결정됩니다. 출력 파일이 \"-\"이면, 표준 출력에 씁니다.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          목표 로캘을 지정합니다\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         PO 파일이 자동으로 만들어졌다고 가정합니다\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         PO 파일이 자동으로 만들어졌다고 가정합니다\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2396,12 +2598,12 @@ msgstr ""
 "두 개 이상의 .pot 파일을 찾았습니다.\n"
 "입력 .pot 파일을 --input 옵션으로 지정하십시오.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "현재 디렉터리를 읽는 데 오류가 발생했습니다"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2409,17 +2611,19 @@ msgstr ""
 "현재 디렉터리에서 .pot 파일을 찾을 수 없습니다.\n"
 "--input 옵션으로 입력 .pot 파일을 지정하십시오.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 하위 프로세스가 종료 코드 %d 번으로 실패했습니다"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "새로운 메시지 목록에는 반드시 여러분 전자메일 주소가 들어가 있어야 합니다.\n"
@@ -2429,44 +2633,49 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 패키지에 대한 한국어 번역문"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "입력 파일에 두 개의 문자셋 \"%s\"과(와) \"%s\"이(가) 존재합니다"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "입력 파일 '%s'에는 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
-#: src/msgl-cat.c:208
+#: 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'의 도메인 \"%1$s\"에는 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"입력 파일 '%2$s'의 도메인 \"%1$s\"에는 문자셋을 지정하는 헤더 항목이 들어 있"
+"지 않습니다"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름이 아닙니다."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2475,10 +2684,11 @@ msgstr ""
 "입력 파일은 여러 개의 인코딩으로 된 메시지가 들어 있고, 그 중의 하나가 \n"
 "UTF-8입니다. 출력을 UTF-8으로 변환합니다.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2486,7 +2696,7 @@ msgstr ""
 "%s이(가) 있습니다. 출력을 UTF-8으로 변환합니다.\n"
 "다른 출력 인코딩을 선택하려면, --to-code 옵션을 쓰세요.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2494,11 +2704,12 @@ msgid ""
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"%s 파일을 %s 인코딩에서 %s 인코딩으로 변환하면 일부 msgid와 msgctxt를 바꾸게 됩니다.\n"
+"%s 파일을 %s 인코딩에서 %s 인코딩으로 변환하면 일부 msgid와 msgctxt를 바꾸게 "
+"됩니다.\n"
 "모든 msgid와 msgctxt를 순수 ASCII로 바꾸거나, 처음부터(소스코드부터) UTF-8\n"
 "인코딩으로 만드십시오.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2511,12 +2722,12 @@ msgstr ""
 "'%s'로(으로) 출력하는 것이 틀렸을 수 있습니다.\n"
 "가능한 해결책은:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2527,7 +2738,7 @@ msgstr ""
 "  그 다음 '%s'을(를) 적용하고,\n"
 "  다시 'msgconv'를 이용해 '%s'로(으로) 변환하십시오\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2540,7 +2751,7 @@ msgstr ""
 "  그 다음 '%s'을(를) 적용하고,\n"
 "  다시 'msgconv'를 이용해 '%s'로(으로) 변환하십시오\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2569,8 +2780,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "복수 표현식이 정수 오버플로우를 발생시킬 수 있습니다"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "복수 표현식이 연산 예외를 발생시킬 수 있습니다. 0으로 나누는 연산을 할 수 있습니다"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"복수 표현식이 연산 예외를 발생시킬 수 있습니다. 0으로 나누는 연산을 할 수 있"
+"습니다"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2615,10 +2830,14 @@ msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "하지만 어떤 메시지는 복수형이 %lu개 있습니다"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "메시지 목록에 복수형 번역이 들어 있지만, 헤더 항목에 \"Plural-Forms: nplurals=정수; plural=표현식;\"이 없습니다"
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"메시지 목록에 복수형 번역이 들어 있지만, 헤더 항목에 \"Plural-Forms: "
+"nplurals=정수; plural=표현식;\"이 없습니다"
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr_plural' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
@@ -2627,11 +2846,11 @@ msgstr "'msgid'와 'msgstr_plural' 항목이 모두 '\\n'으로 시작하지 않
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr[%u]' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgid_plural' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
@@ -2640,11 +2859,11 @@ msgstr "'msgid'와 'msgid_plural' 항목이 모두 '\\n'으로 끝나지 않습�
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgstr[%u]' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgstr' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "복수 처리는 GNU gettext 확장 기능입니다"
 
@@ -2676,15 +2895,15 @@ msgstr "유니코드 말줄임표가 아닌 ASCII 말줄임표('...')"
 msgid "space before ellipsis found in user visible strings"
 msgstr "사용자에 보이는 문자열에 말줄임표 앞에 공백이 있습니다"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "유니코드 쌍따옴표가 아닌 ASCII 쌍따옴표"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "유니코드 홑따옴표가 아닌 ASCII 홑따옴표"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "유니코드 점이 아닌 ASCII 점('%c')"
@@ -2699,37 +2918,49 @@ msgstr "%s: 입력이 \"%s\" 인코딩에서 올바르지 않습니다"
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" 인코딩에서 \"%s\" 인코딩으로 변환하는 동안 오류 발생"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "입력 파일은 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, iconv()가 이같은 변환을 지원하지 않습니다."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
+"iconv()가 이같은 변환을 지원하지 않습니다."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "\"%s\"에서 \"%s\"(으)로 변환하면 중복됩니다: 다른 두 개 이상의 msgid가 똑같아 집니다."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"\"%s\"에서 \"%s\"(으)로 변환하면 중복됩니다: 다른 두 개 이상의 msgid가 똑같"
+"아 집니다."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()를 지원되지 않는 상태로 빌드되었습니다."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "백업 종류"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2752,17 +2983,17 @@ msgstr ""
 "보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻으려고 퍼지\n"
 "매칭이 사용됩니다.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      과거 소스를 참조하는 번역문\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     새로운 소스를 참조\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2771,39 +3002,42 @@ msgstr ""
 "  -C, --compendium=<파일>      메시지 번역 라이브러리 추가,\n"
 "                               두 개 이상 지정할 수 있습니다\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                def.po를 업데이트합니다\n"
-"                              이미 def.po를 업데이트했다면 아무 것도 안 합니다\n"
+"                              이미 def.po를 업데이트했다면 아무 것도 안 합니"
+"다\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "업데이트 모드에서 출력 파일 위치:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
+msgstr ""
+"      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2814,107 +3048,135 @@ msgstr ""
 "선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
 "  none, off       백업을 만들지 않습니다(--backup 옵션이 있어도)\n"
 "  nummbered, t    번호를 붙인 백업을 만듭니다\n"
-"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단히\n"
+"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
+"히\n"
 "  simple, never   간단한 백업만을 만듭니다\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
-msgstr "--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접미어는 '~'입니다.\n"
+msgstr ""
+"--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접"
+"미어는 '~'입니다.\n"
+
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       진행상태 표시를 하지 않습니다\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "이 메시지는 복수형을 지정해야만 합니다"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "예전 %s%ld + 참조문 %ld, 결합 %ld, 퍼지 %ld, 빠짐 %ld, 쓸모없음 %ld개를 읽었습니다.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"예전 %s%ld + 참조문 %ld, 결합 %ld, 퍼지 %ld, 빠짐 %ld, 쓸모없음 %ld개를 읽었"
+"습니다.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " 완료.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "사용법: %s [옵션] [파일]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "이진 메시지 목록을 Uniforum 스타일 .po 파일로 변환합니다.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  자바 모드: 입력은 자바 ResourceBundle 클래스입니다\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  자바 모드: 입력은 자바 ResourceBundle 클래스입"
+"니다\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C# 리소스 모드: 입력은 .NET .resources 파일입니다\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# 리소스 모드: 입력은 .NET .resources 파일입니"
+"다\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl 모드: 입력은 tcl/msgcat .msg 파일입니다\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  <파일> ...                  입력 .mo 파일\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "자바 모드에서 입력 파일 위치:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "클래스 이름은 로캘 이름에 리소스 이름을 밑줄로 구분해서 연결한 이름으로\n"
 "결정됩니다. 클래스는 CLASSPATH에 따른 위치에 놓이게 됩니다.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 모드에서 입력 파일 지정:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2923,12 +3185,12 @@ msgstr ""
 "-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 아래\n"
 "디렉터리에(디렉터리 이름은 로캘에 따라 달라집니다) 들어 있습니다.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 모드에서 입력 파일 지정:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2937,17 +3199,17 @@ msgstr ""
 "-l 옵션과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리\n"
 "아래에 들어 있습니다.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                들여쓰기된 출력 형태로 씁니다\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2968,17 +3230,21 @@ msgstr ""
 "것만을 쓰게 됩니다. 파일의 위치는 모두 유지됩니다. --unique 옵션을\n"
 "사용할 때, 중복된 메시지를 버립니다.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 중복된 메시지만을 출력합니다\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                   유일한 메시지만을 출력하고, 중복된 것은 버립니다\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                   유일한 메시지만을 출력하고, 중복된 것은 버립"
+"니다\n"
 
-#: src/open-catalog.c:57 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 "<표준입력>"
@@ -3039,27 +3305,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "#~가 모순되게 이용되었습니다"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "'msgstr[]' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "'msgstr_plural' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "'msgstr' 부분이 빠졌습니다"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "첫 번째 복수형의 인덱스가 0이 아닙니다"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "복수형의 인덱스가 잘못되었습니다"
@@ -3069,7 +3335,7 @@ msgstr "복수형의 인덱스가 잘못되었습니다"
 msgid "too many errors, aborting"
 msgstr "오류가 너무 많아서 중단합니다"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "잘못된 가변바이트 문자열"
@@ -3079,41 +3345,41 @@ msgstr "잘못된 가변바이트 문자열"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "파일의 끝에서 불완전한 다중바이트 문자열"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "줄의 끝에서 불완전한 다중바이트 문자열"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv 실패"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "알 수 없는 키워드 \"%s\""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "잘못된 제어 시퀀스"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "문자열 내부에서 파일이 끝남"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "문자열 내부에서 행이 끝남"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "이 파일은 도메인 지시자가 안 들어 있을 수도 있습니다"
@@ -3143,7 +3409,7 @@ msgstr "\"%s\" 뒤에 '=' 문자 빠짐"
 msgid "invalid non-blank line"
 msgstr "잘못된 공백 아닌 줄"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" 파일이 잘렸습니다"
@@ -3153,29 +3419,45 @@ msgstr "\"%s\" 파일이 잘렸습니다"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" 파일에 NUL로 끝나지 않는 문자열이 있습니다"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "\"%s\" 파일에 NUL로 끝나지 않는 문자열이 있습니다"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" 파일은 GNU .mo 형식이 아닙니다"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "\"%s\" 파일의 %s 위치에 NUL로 끝나지 않는 문자열이 있습니다"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "경고:  유니코드 문자에 \\uxxxx 문법이 틀렸습니다"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: 경고: U+%04X 서로게이트 문자가 단독으로 있습니다"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "경고: 잘못된 유니코드 문자"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "경고: 완결되지 않은 문자열"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "경고: 문법 오류"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "경고: 키/값 쌍이 완결되지 않았습니다"
 
@@ -3183,11 +3465,11 @@ msgstr "경고: 키/값 쌍이 완결되지 않았습니다"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "경고: 문법 오류, 문자열 다음에 ';'이 와야 합니다"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "경고: 문법 오류, 문자열 다음에 '=' 혹은 ';'이 와야 합니다"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s 및 %s이(가) 만들었습니다.\n"
@@ -3196,43 +3478,43 @@ msgstr "%s 및 %s이(가) 만들었습니다.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "다닐로 세이건(Danilo Segan)"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "세르비아어 텍스트를 키릴 문자에서 라틴 문자로 변환합니다.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr "입력 텍스트는 표준 입력에서 읽습니다. 변환한 텍스트는 표준 출력으로 출력합니다.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "입력이 \"%s\" 인코딩에서 올바르지 않습니다"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" 인코딩에서 \"%s\" 인코딩으로 변환하는 동안 오류 발생"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "인수는 두 개이어야 합니다"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "사용법: %s [옵션] <URL> <파일>\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3241,111 +3523,134 @@ msgstr ""
 "URL의 내용을 가져와서 출력합니다. <URL>에 접근할 수 없는 경우에는, 로칼에서 접근할 수 있는\n"
 "<파일>이 대신 사용됩니다.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" 파일을 읽는 동안 오류 발생"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "표준 출력에 쓰는 동안 오류 발생"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" 파일을 읽은 후에 오류 발생"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "%s 항목을 가져오는 중..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " 제한 시간 초과.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " 실패.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다. PO 파일 문법을 시도해 보십시오."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다. "
+"PO 파일 문법을 시도해 보십시오."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "메시지 목록에 컨텍스트 의존 번역이 들어 있지만, 출력 형식이 컨텍스트를 지원하지 않습니다."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"메시지 목록에 컨텍스트 의존 번역이 들어 있지만, 출력 형식이 컨텍스트를 지원하"
+"지 않습니다."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니다. properties 파일 대신에 \"msgfmt --java\"로 자바 클래스를 만들어 보십시오."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
+"다. properties 파일 대신에 \"msgfmt --java\"로 자바 클래스를 만들어 보십시오."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니다."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
+"다."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "출력 파일 \"%s\"을(를) 만들 수 없습니다"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "표준 출력"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" 디렉터리를 만드는 데 실패했습니다"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# 클래스 컴파일에 실패했습니다. --verbose로 시도해 보십시오"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "C# 클래스 컴파일에 실패했습니다"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수를 세팅하십시오"
+msgstr ""
+"자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
+"를 세팅하십시오"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "잘못된 가변바이트 시퀀스"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "국제화된 메시지에는 '\\%c' 이스케이프 시퀀스가 들어 있으면 안 됩니다"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3358,7 +3663,7 @@ msgstr ""
 "발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3375,16 +3680,21 @@ msgstr ""
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
-msgstr "메시지 목록에 복수형 번역이 들어 있지만, Qt 메시지 목록은 복수형을 지원하지 않습니다\n"
+msgstr ""
+"메시지 목록에 복수형 번역이 들어 있지만, Qt 메시지 목록은 복수형을 지원하지 "
+"않습니다\n"
 
 #: src/write-qt.c:694
 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 ""
-"메시지 목록에 ISO-8859-1이 아닌 msgctxt 문자열이 들어 있습니다. Qt 메시지 목록\n"
-"형식에서는 번역된 문자열만 유니코드를 지원하고, 컨텍스트 문자열에서는 지원하지\n"
+"메시지 목록에 ISO-8859-1이 아닌 msgctxt 문자열이 들어 있습니다. Qt 메시지 목"
+"록\n"
+"형식에서는 번역된 문자열만 유니코드를 지원하고, 컨텍스트 문자열에서는 지원하"
+"지\n"
 "않습니다.\n"
 
 #: src/write-qt.c:718
@@ -3393,16 +3703,18 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"메시지 목록에 ISO-8859-1이 아닌 msgid 문자열이 들어 있습니다. Qt 메시지 목록\n"
-"형식에서는 번역된 문자열만 유니코드를 지원하고, 번역하지 않은 문자열에서는 지원하지\n"
+"메시지 목록에 ISO-8859-1이 아닌 msgid 문자열이 들어 있습니다. Qt 메시지 목"
+"록\n"
+"형식에서는 번역된 문자열만 유니코드를 지원하고, 번역하지 않은 문자열에서는 지"
+"원하지\n"
 "않습니다.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s 하위 프로세스에 쓰는 동안 오류 발생"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3410,7 +3722,7 @@ msgstr ""
 "메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
 "C# .resources 형식은 컨텍스트를 지원하지 않습니다\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3418,7 +3730,7 @@ msgstr ""
 "메시지 목록에 복수형 번역이 들어 있지만,\n"
 "C# .resource 형식은 복수형을 지원하지 않습니다\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3426,7 +3738,7 @@ msgstr ""
 "메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
 "Tcl 메시지 목록 형식은 컨텍스트를 지원하지 않습니다\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3434,36 +3746,56 @@ msgstr ""
 "메시지 목록에 복수형 번역이 들어 있지만, \n"
 "Tcl 메시지 목록 형식은 복수형을 지원하지 않습니다\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 경고: 완결되지 않은 정규식"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "경고: 잘못된 유니코드 문자"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: 경고: 잘못된 유니코드 문자"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 경고: 완결되지 않은 문자 상수"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3472,7 +3804,7 @@ msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3481,7 +3813,7 @@ msgstr ""
 "%s:%d: 길고 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3490,7 +3822,7 @@ msgstr ""
 "%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3499,12 +3831,12 @@ msgstr ""
 "%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 실패"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3513,119 +3845,139 @@ msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: 경고: 잘못된 유니코드 문자"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: 경고: '}'가 와야 하는 곳에 ')'가 발견되었습니다"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 경고: ')가 와야 하는 곳에 '}'가 발견되었습니다"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s'은(는) 올바른 인코딩 이름이 아닙니다. ASCII를 대신 사용합니다.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "문법 검사 '%s'을(를) 알 수 없습니다"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "문장 마침 종류 '%s'을(를) 알 수 없습니다"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "경고: ITS 규칙 '%s' 파일이 없습니다"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr "경고: ITS 규칙 '%s' 파일이 없습니다. gettext 설치를 확인해 보십시오"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다. C 형식으로 간주함"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=<이름>    출력에(messages.po 대신) <이름>.po를 씁니다\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=<이름>    출력에(messages.po 대신) <이름>.po를 씁니"
+"다\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=<디렉터리>    출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=<디렉터리>    출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "입력 파일의 언어 선택:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=<이름>          지정한 언어로 인식하도록 합니다\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP, \n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP, \n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3634,28 +3986,30 @@ msgstr ""
 "      --from-code=<이름>      입력 파일의 인코딩\n"
 "                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "기본값으로 입력 파일은 ASCII로 인코딩되어 있다고 가정합니다.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=<파일.po>   <파일.po>의 메시지는 뽑아내지 않습니다\n"
+msgstr ""
+"  -x, --exclude-file=<파일.po>   <파일.po>의 메시지는 뽑아내지 않습니다\n"
 
 # TAG가 정확이 뭐지?
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -c<태그>, --add-comments[=태그]    키워드 줄 앞에 <태그>로 시작하는 주석\n"
@@ -3663,7 +4017,7 @@ msgstr ""
 "  -c, --add-comments                 키워드 줄 앞에 모든 주석 부분을 출력\n"
 "                                     파일에 씁니다\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3674,7 +4028,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3685,245 +4039,198 @@ msgstr ""
 "                                (single-space(공백 1개)가 기본값,\n"
 "                                 아니면 double-space(공백 2개))\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (다음 언어만 지원: C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme Java,\n"
+"                                (다음 언어만 지원: C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                                (다음 언어만 지원: C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (다음 언어만 지원: C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=WORD:ARG:FLAG    키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
 "                              추가 플래그\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (다음 언어만 지원: C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (다음 언어만 지원: C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs                입력에서 ANSI C 삼중자(trigraph)를 인식합니다\n"
+msgstr ""
+"  -T, --trigraphs                입력에서 ANSI C 삼중자(trigraph)를 인식합니"
+"다\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=<파일>            <파일>에서 ITS 규칙 적용\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (XML 기반 언어만 지원)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++만 지원)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    더 자세한 형식문자열 인식 결과\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               itstool 주석 출력\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user             외부 사용자를 위해 FSF 저작권 표시를 뺍니다\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user             외부 사용자를 위해 FSF 저작권 표시를 뺍니"
+"다\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지정합니다\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=전자메일@주소   msgid 버그를 보고할 주소를 지정합니다\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=전자메일@주소   msgid 버그를 보고할 주소를 지정합"
+"니다\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[문자열], --msgstr-prefix[=문자열]      msgstr 항목에 <문자열> 혹은 \"\"을 \n"
+"  -m[문자열], --msgstr-prefix[=문자열]      msgstr 항목에 <문자열> 혹은 "
+"\"\"을 \n"
 "                                            접두어로 사용합니다\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[문자열], --msgstr-suffix[=문자열]      msgstr 항목에 <문자열> 혹은 \"\"을 \n"
+"  -M[문자열], --msgstr-suffix[=문자열]      msgstr 항목에 <문자열> 혹은 "
+"\"\"을 \n"
 "                                            접미어로 사용합니다\n"
 
-#: src/xgettext.c:2040
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr "--flag의 인자가 <keyword>:<argnum>:[pass-]<flag> 문법이 아닙니다: %s"
 
-#: src/xgettext.c:2165
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "표준 입력"
 
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "%s%s에 ASCII가 아닌 문자열이 있습니다."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s에 또는 그 앞에 ASCII가 아닌 문자열이 있습니다."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "%s%s에 시작하는 ASCII가 아닌 문자열이 있습니다."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: 경고: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니다. 이유: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"이름없는 인자로 '%s' 포맷 문자열을 쓰면 올바른 지역화를 할 수 없습니다.\n"
-"번역자가 인자 순서를 조정해야 합니다.\n"
-"이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
-"아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
-
-#: src/xgettext.c:2545
-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 ""
-"비어 있는 msgid입니다. 이 msgid는 GNU gettext가 다른 목적으로 사용합니다:\n"
-"gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
-"헤더 항목을 리턴합니다.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
-
-#: src/xgettext.c:3334
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
-
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3935,21 +4242,16 @@ msgstr ""
 "변수를 지정하십시오. 그렇지 않으면 --msgid-bugs-address\n"
 "명령행 옵션을 사용하십시오.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "'%s' 언어를 알 수 없습니다"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: 경고: U+%04X 서로게이트 문자가 단독으로 있습니다"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3958,7 +4260,7 @@ msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3967,7 +4269,7 @@ msgstr ""
 "%s:%d: 길고 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3976,7 +4278,7 @@ msgstr ""
 "%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3985,7 +4287,7 @@ msgstr ""
 "%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3994,138 +4296,198 @@ msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: 경고: %s은(는) 허용하지 않습니다"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: 경고: 완결되지 XML 마크업"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: 문자열을 끝내는 \"%s\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
+msgstr ""
+"%s:%d: 문자열을 끝내는 \"%s\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{십육진수}에서 오른쪽 중괄호가 빠졌습니다"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\l\")이 잘못되었습니다"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\u\")이 잘못되었습니다"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\"에서 변수 인터폴레이션이 잘못되었습니다"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\L\")이 잘못되었습니다"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\U\")이 잘못되었습니다"
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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 "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
-
-#: src/x-python.c:324
-#, c-format
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스\n"
-"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
-
-#: src/x-python.c:341
-#, c-format
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: 길고 불완전한 다중바이트 시퀀스\n"
-"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
-
-#: src/x-python.c:354
-#, c-format
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
-"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
-
-#: src/x-python.c:364
-#, c-format
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
-"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
-
-#: src/x-python.c:397
-#, c-format
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
-"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "\"%s\" 인코딩은 어떤 인코딩인지 알 수 없습니다. 대신 ASCII로 진행합니다."
+msgstr ""
+"\"%s\" 인코딩은 어떤 인코딩인지 알 수 없습니다. 대신 ASCII로 진행합니다."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: 잘못된 문자열 정의"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 다음에 숫자가 빠졌습니다"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 잘못된 문자열 표현"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: 잘못된 문자열 정의"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: 잘못된 문자열 정의"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다. 대신에 eval_gettext를 사용하십시오"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다. 대신에 "
+"eval_gettext를 사용하십시오"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
@@ -4255,3 +4617,101 @@ msgstr "주석 또는 처리 지시자 안에"
 #, c-format
 msgid "document ended unexpectedly: %s"
 msgstr "문서가 예기치 않게 끝남: %s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: '--%s' 옵션은 인수를 허용하지 않습니다\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: 인식할 수 없는 옵션 '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: '-W %s' 옵션은 모호한 옵션입니다\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "경고: PO 파일 헤더가 퍼지입니다\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "경고: 과거 버전의 msgfmt은 여기에 오류를 낼 것입니다\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "%s%s에 ASCII가 아닌 문자열이 있습니다."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "%s%s에 또는 그 앞에 ASCII가 아닌 문자열이 있습니다."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "%s%s에 시작하는 ASCII가 아닌 문자열이 있습니다."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: 경고: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니"
+#~ "다. 이유: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: "
+#~ "%s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "이름없는 인자로 '%s' 포맷 문자열을 쓰면 올바른 지역화를 할 수 없습니다.\n"
+#~ "번역자가 인자 순서를 조정해야 합니다.\n"
+#~ "이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
+#~ "아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
+
+#~ 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 ""
+#~ "비어 있는 msgid입니다. 이 msgid는 GNU gettext가 다른 목적으로 사용합니"
+#~ "다:\n"
+#~ "gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
+#~ "헤더 항목을 리턴합니다.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index 34c85647d..641cbb425 100644
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -1,200 +1,191 @@
-# Norwegian messages for GNU gettext.  (bokm�l dialect)
-# Copyright (C) 1996, 1999 Free Software Foundation, Inc.
-# Karl Anders �ygard <karlo@ifi.uio.no>, 1996.
+# Norwegian Bokmal translations for gettext-tools package.
+# Copyright (C) 1996, 1999, 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Karl Anders Øygard <karlo@ifi.uio.no>, 1996.
+# Johnny A. Solbu <johnny@solbu.net>, 2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.10.37\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\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"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-08-10 10:13+0200\n"
+"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
+"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:325
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "kan ikke opprette utfilen �%s�"
+msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:339
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "kan ikke opprette utfilen �%s�"
+msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:435
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
-msgstr "kan ikke opprette utfilen �%s�"
+msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:450
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "kan ikke opprette utfilen �%s�"
+msgstr "kan ikke opprette utfilen «%s»"
 
 #: gnulib-lib/closeout.c:66
 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-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "feil under �pning av �%s� for lesing"
+msgid "preserving permissions for %s"
+msgstr ""
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:175
 #, fuzzy, c-format
-msgid "cannot open backup file \"%s\" for writing"
-msgstr "feil under �pning av �%s� for skriving"
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
+msgstr "feil under åpning av «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:179
 #, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "feil under lesing av �%s�"
+msgid "cannot open backup file %s for writing"
+msgstr "feil under åpning av «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:183
 #, fuzzy, c-format
-msgid "error writing \"%s\""
-msgstr "feil under skriving av filen �%s�"
+msgid "error reading %s"
+msgstr "feil under lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:187
 #, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "feil under lesing av �%s�"
+msgid "error writing %s"
+msgstr "feil under skriving av filen «%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
-#: 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
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+msgid "error after reading %s"
+msgstr "feil under lesing av «%s»"
+
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:443
 #, c-format
-msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:343
+#: gnulib-lib/csharpexec.c:255
 #, c-format
-msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 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:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, 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"
-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"
-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"
-msgstr "%s: flagget �%c%s� tillater ikke argumenter\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: flagget «%s» er flertydig\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"
-msgstr "%s: flagget �%s� krever et argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: flagget «%s» er flertydig\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent flagg �--%s�\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukjent flagg «%c%s»\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent flagg �%c%s�\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: flagget «%c%s» tillater ikke argumenter\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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: flagget «%s» krever et argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+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"
-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"
-msgstr "%s: flagg �-W %s� tillater ikke et argument\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, 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
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "feil under skriving av filen �%s�"
+msgstr "feil under skriving av filen «%s»"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -204,102 +195,287 @@ 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:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, 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/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, 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:265
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke opprette utfilen �%s�"
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
+msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: gnulib-lib/w32spawn.h:49
 #, 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:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "Could not parse file %s as XML"
 msgstr ""
 
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Prøv «%s --help» for mer informasjon.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr ""
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+#, fuzzy
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrevet av %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+msgid "cannot extract rules for %s"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "feil under åpning av «%s» for lesing"
+
 #: 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-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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
@@ -307,107 +483,123 @@ msgstr "format-spesifiseringene for argument %lu er ulike"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:181
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+
+#: src/format-c.c:36
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:588
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
-msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
+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
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:130 src/format-java.c:191
+#: src/format-csharp.c:127 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:161 src/format-java.c:346
+#: src/format-csharp.c:158 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 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-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -499,90 +691,115 @@ 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 '%s' and '%s' for argument {%u} are not the same"
+msgstr "format-spesifiseringene for argument %lu er ulike"
+
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+#: src/format-kde.c:242
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "feil under lesing av «%s»"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, 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] ""
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
+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
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, 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-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:433
@@ -592,54 +809,72 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
-#, 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-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
 
-#: src/format-python.c:112
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
+#: 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"
-msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
+"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"
-msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
+"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
@@ -676,71 +911,40 @@ 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
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#: src/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
-#, 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:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, 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
-#, 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:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -748,351 +952,408 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 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:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, 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
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
 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
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "minst to filer må angis"
+
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+msgid "cannot create XPath context"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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
-#, fuzzy
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:1086
 #, c-format
-msgid "could not get host name"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr ""
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
 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/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+msgid "cannot read %s: %s"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, fuzzy, c-format
 msgid "at most one input file allowed"
-msgstr "trenger n�yaktig to innfiler"
+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:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, 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:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:426
 #, 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:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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
-#, fuzzy, c-format
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
+#, c-format
 msgid "Input file location:\n"
-msgstr "ingen innfil angitt"
+msgstr "Inndatafilplassering:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, 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:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, 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:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, 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:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:452
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:454
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:484
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:488
 #, 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:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, 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:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, 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:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, 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:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, 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:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, 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:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, 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:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, 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:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, 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:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, 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:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
-"Bruksm�te: %s [FLAGG] [FIL]...\n"
-"Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+"Bruksmåte: %s [FLAGG] [FIL]...\n"
+"Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 "flagg.\n"
 "  -e, --no-escape          ikke bruk C-escapekoder i utdata (standard)\n"
 "  -E, --escape             bruk C-escapekoder i utdata, ingen utvidede tegn\n"
@@ -1104,31 +1365,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:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, 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:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:1023
 #, 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"
@@ -1137,127 +1398,112 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
-msgstr ""
-"  -V, --version                  skrive ut programversjon og avslutte\n"
-"  -w, --width=ANTALL             sett sidebredden i utdata\n"
-"  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-"                                 definisjoner, standard er uendelig dersom\n"
-"                                 ikke satt\n"
-"  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-"                                 definisjoner, standard er 1 dersom ikke satt\n"
-"\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
+msgstr ""
+"Setter sammen og fusjonerer de angitte PO-filer\n"
 "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
-"Ved � bruke --more-than-flagget, kan �kt fellesskap bli anmodet\n"
-"f�r meldingene blir skrevet ut.  Omvendt kan --less-than-flagget brukes\n"
-"for � angi mindre fellesskap for meldingene blir skrevet ut (eks.\n"
+"Ved å bruke --more-than-flagget, kan økt fellesskap bli anmodet\n"
+"før meldingene blir skrevet ut.  Omvendt kan --less-than-flagget brukes\n"
+"for å angi mindre fellesskap for meldingene blir skrevet ut (eks.\n"
 "--less-than=2 vil bare skrive ut unike meldinger).  Oversettelser,\n"
-"kommentarer og uttrekkskommentarer bevares, men bare fra den f�rste\n"
+"kommentarer og uttrekkskommentarer bevares, men bare fra den første\n"
 "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:1039
 #, 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:1041
 #, 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:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, 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:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, 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:337 src/msguniq.c:378
 #, 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:380
 #, 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:345 src/msgmerge.c:628
 #, 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:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "ingen innfiler angitt"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "trenger n�yaktig to innfiler"
+msgstr "trenger nøyaktig to innfiler"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
-#, fuzzy, c-format, no-wrap
+#: src/msgcmp.c:217
+#, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -1266,190 +1512,181 @@ msgid ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
-"Bruksm�te: %s [FLAGG] def.po ref.po\n"
-"Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte flagg.\n"
-"  -D, --directory=KATALOG     legge til KATALOG til s�kelisten for innfiler\n"
-"  -h, --help                  vise denne hjelpen og avslutte\n"
-"  -V, --version               skrive ut programversjon og avslutte\n"
-"\n"
-"Sammenligne to Uniforum-aktige .po-filer for � sjekke at begge inneholder\n"
+"Sammenligne to Uniforum-aktige .po-filer for å sjekke at begge inneholder\n"
 "det samme settet med msgid-strenger.  def.po-filen er en eksisterende PO-fil\n"
-"med de gamle oversettelsene.  ref.po-filen er det sist lagde PO(T)-filen\n"
-"(som regel av xgettext).  Dette er nyttig for � sjekke at du har oversatt\n"
-"alle meldingene i programmet ditt.  N�r en eksakt overensstemmelse ikke\n"
-"finnes, blir �fuzzy�-sammenligning brukt for � f� en bedre diagnostikk.\n"
+"med de gamle oversettelsene.  ref.pot-filen er det sist lagde PO-filen eller en PO-mal\n"
+"(som regel av xgettext).  Dette er nyttig for å sjekke at du har oversatt\n"
+"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:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
-#, fuzzy, c-format
+#: src/msgcmp.c:324
+#, c-format
 msgid "this message is untranslated"
-msgstr "advarsel: denne meldingen er ikke brukt"
+msgstr "denne meldingen er uoversatt"
 
-#: 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:1576
 #, 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:1579
 #, 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:1608
 #, 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:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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"
+msgstr "minst to filer må angis"
 
-#: src/msgcomm.c:351
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:363
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"  -V, --version                  skrive ut programversjon og avslutte\n"
-"  -w, --width=ANTALL             sett sidebredden i utdata\n"
-"  -<, --less-than=ANTALL         skrive ut meldinger med mindre enn ANTALL\n"
-"                                 definisjoner, standard er uendelig dersom\n"
-"                                 ikke satt\n"
-"  ->, --more-than=ANTALL         skrive ut meldinger med mer enn ANTALL\n"
-"                                 definisjoner, standard er 1 dersom ikke satt\n"
-"\n"
 "Finne meldinger som er felles i to eller flere av de angitt PO-filene.\n"
-"Ved � bruke --more-than-flagget, kan �kt fellesskap bli anmodet\n"
-"f�r meldingene blir skrevet ut.  Omvendt kan --less-than-flagget brukes\n"
-"for � angi mindre fellesskap for meldingene blir skrevet ut (eks.\n"
+"Ved å bruke --more-than-flagget, kan økt fellesskap bli forespurt\n"
+"før meldingene blir skrevet ut.  Omvendt kan --less-than-flagget brukes\n"
+"for å angi mindre fellesskap før meldingene blir skrevet ut (eks.\n"
 "--less-than=2 vil bare skrive ut unike meldinger).  Oversettelser,\n"
-"kommentarer og uttrekkskommentarer bevares, men bare fra den f�rste\n"
+"kommentarer og uttrekkskommentarer bevares, men bare fra den første\n"
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
-"bli bevart.\n"
+"bli kumulert.\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:1186
 #, c-format
 msgid ""
-"      --omit-header           don't write header with `msgid \"\"' entry\n"
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:339
 #, 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:363 src/msgen.c:359 src/msgmerge.c:642
 #, 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:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, 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:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
 msgid ""
-"      --add-location          preserve '#: filename:line' lines (default)\n"
+"  -n, --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:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, 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:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
 
-#: src/msgen.c:233
-#, fuzzy, c-format
+#: src/msgen.c:263
+#, c-format
 msgid "exactly one input file required"
-msgstr "trenger n�yaktig to innfiler"
+msgstr "nøyaktig én inndatafil kreves"
 
-#: src/msgen.c:274
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1458,22 +1695,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
-#, fuzzy, c-format
+#: src/msgexec.c:201
+#, c-format
 msgid "missing command name"
-msgstr "mangler argumenter"
+msgstr "mangler kommandonavn"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1483,67 +1720,84 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:276
 #, 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
 #, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgid "Command input:\n"
+msgstr "kommandoinndata:\n"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
-msgid "write to stdout failed"
+msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:355
 #, c-format
-msgid "write to %s subprocess failed"
+msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:296
-#, fuzzy, c-format
+#: src/msgfilter.c:304
+#, c-format
 msgid "missing filter name"
-msgstr "mangler argumenter"
+msgstr "mangler filternavn"
 
-#: src/msgfilter.c:320
-#, fuzzy, c-format
+#: src/msgfilter.c:324
+#, c-format
 msgid "at least one sed script must be specified"
-msgstr "minst to filer m� angis"
+msgstr "minst ett sed-skript må angis"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:441
 #, 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:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1551,210 +1805,234 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:459
 #, 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:477 src/msggrep.c:600
 #, 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:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:485
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
+#: src/msgfilter.c:665
 #, c-format
-msgid "Not yet implemented."
-msgstr ""
+msgid "filter output is not terminated with a newline"
+msgstr "filterutdata avsluttes ikke med en ny linje"
 
-#: src/msgfilter.c:616
+#: src/msgfmt.c:372
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfilter.c:644
+#: src/msgfmt.c:419
 #, c-format
-msgid "communication with %s subprocess failed"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfilter.c:711
+#: src/msgfmt.c:471
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
+msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:302
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
-msgid "invalid endianness: %s"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
-msgid "Ulrich Drepper"
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, c-format
+msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
-msgstr ""
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s og %s utelukker hverandre i %s"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:626 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:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "kan ikke lokalisere ITS-regler for %s"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, 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:881
 #, 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:886
 #, 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:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
-#, 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:922
 #, 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:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:931
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:937
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:957
 #, 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:959 src/msgfmt.c:975 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:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1763,48 +2041,93 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
-#, fuzzy, c-format
+#: src/msgfmt.c:973
+#, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "ingen innfil angitt"
+msgstr "Utdatafilplassering i C#-modus:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:979 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:981
 #, 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:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:991
 #, 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:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1812,33 +2135,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1043
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1045
 #, 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:1048
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1846,115 +2169,119 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:1058
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
+
+#: src/msgfmt.c:1063
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1072
 #, 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:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
-#, fuzzy, c-format
+#: src/msgfmt.c:1185
+#, 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
-#, 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"
+msgstr "advarsel: PO-filhode mangler eller er ugyldig\n"
 
-#: src/msgfmt.c:882
-#, 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:1187
 #, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
+msgid "warning: charset conversion will not work\n"
+msgstr "advarsel: tegnsettetkonvertering vil ikke virke.\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "domenenavnet �%s� passer ikke som filnavn"
+msgstr "domenenavnet «%s» passer ikke som filnavn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "domenenavnet �%s� passer ikke som filnavn: bruker prefiks"
+msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:1230
 #, c-format
-msgid "`domain %s' directive ignored"
-msgstr "n�kkelord �domain %s� ignorert"
+msgid "'domain %s' directive ignored"
+msgstr "«domain %s»-direktivet ignorert"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1290
 #, c-format
-msgid "empty `msgstr' entry ignored"
-msgstr "tom �msgstr�-linje ignorert"
+msgid "empty 'msgstr' entry ignored"
+msgstr "tom «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1291
 #, c-format
-msgid "fuzzy `msgstr' entry ignored"
-msgstr "antatt �msgstr�-linje ignorert"
+msgid "fuzzy 'msgstr' entry ignored"
+msgstr "uklar «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1339
 #, 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/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "feil under lesing av �%s�"
+msgstr "feil under lesing av «%s»"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:501
 #, 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:521
 #, 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:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1994,30 +2321,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:602
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2025,24 +2354,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:371
 #, 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:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:383
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2050,54 +2379,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:391
 #, 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:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:406
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:472
 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:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:493
 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:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1117
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2109,54 +2438,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:1621
 #, 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:178 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:258
 #, 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"
+"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 "
+"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:392 src/msgl-iconv.c:366
 #, 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
-#, fuzzy, c-format
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
+#, c-format
 msgid "warning: "
-msgstr "%s: advarsel: "
+msgstr "advarsel: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:444
 #, 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:450
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2165,7 +2494,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2174,7 +2503,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2183,12 +2512,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2196,7 +2525,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2205,7 +2534,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2213,194 +2542,202 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:145
 #, 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:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:270
 #, 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:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
-#, fuzzy
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
-msgstr "ulovlig kontrollsekvens"
+msgstr "ugyldig flertallsverdi"
 
-#: src/msgl-check.c:360
-#, fuzzy
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
-msgstr "ulovlig kontrollsekvens"
+msgstr "ugyldig flertallsuttrykk"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
-#, fuzzy, c-format
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, c-format
 msgid "nplurals = %lu"
-msgstr "ulovlig kontrollsekvens"
+msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
-#, fuzzy, c-format
+#: src/msgl-check.c:478
+#, 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"
+msgstr[0] "men noen meldinger har kun èn flertallsform"
+msgstr[1] "men noen meldinger har kun %lu flertallsformer"
 
-#: src/msgl-check.c:408
-#, fuzzy, c-format
+#: src/msgl-check.c:494
+#, 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"
+msgstr[0] "men noen meldinger har èn flertallsform"
+msgstr[1] "men noen meldinger har %lu flertallsformer"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:518
 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
-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:616
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke begge to med `\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:623
 #, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "�msgid�- og �msgstr[%u]�-innslagene begynner ikke med `\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke begge to med `\\n'"
 
-#: src/msgl-check.c:549
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "�msgid�- og �msgstr�-innslagene begynner ikke med `\\n'"
+#: src/msgl-check.c:639
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+msgstr "«msgid»- og «msgstr»-innslagene begynner ikke begge to med `\\n'"
 
-#: src/msgl-check.c:567
-#, 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:657
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke begge to med `\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:664
 #, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr "�msgid�- og �msgstr[%u]�-innslagene slutter ikke med `\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke begge to med `\\n'"
 
-#: src/msgl-check.c:590
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "�msgid�- og �msgstr�-innslagene slutter ikke med `\\n'"
+#: src/msgl-check.c:680
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+msgstr "«msgid»- og «msgstr»-innslagene slutter ikke begge to med `\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
-#, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "filhodefelt �%s� mangler i filhode"
+#: src/msgl-check.c:818
+#, c-format
+msgid "header field '%s' still has the initial default value\n"
+msgstr "filhodefelt «%s» har fremdeles den opprinnelige standardverdien\n"
 
-#: src/msgl-check.c:703
-#, 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:835
+#, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "filhodefelt «%s» mangler i filhode\n"
 
-#: src/msgl-check.c:717
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
-msgstr "noen filhodefelt har fremdeles sin initielle verdi"
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:730
-#, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "feltet �%s� har fremdeles sin forvalgte verdi"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
 
-#: src/msgl-iconv.c:64
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
-#, fuzzy, c-format
+#: src/msgl-iconv.c:69
+#, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "feil under �pning av �%s� for lesing"
+msgstr "%s: feil under konvertering fra «%s»-koding til «%s»-koding"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:288
 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
-#, fuzzy, c-format
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
+#, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv(),\n"
-"og iconv() st�tter ikke \"%s\".\n"
+"Kan ikke konvertere fra «%s» til «%s». %s avhenger av iconv(). Denne "
+"versjonen støtter ikke denne konverteringen."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:330
 #, 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
-#, fuzzy, c-format
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
+#, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
-"Denne versjonen ble blygget uten iconv().\n"
+"Kan ikke konvertere fra «%s» til «%s». %s avhenger av iconv(). Denne "
+"versjonen ble bygget uten iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
-#, fuzzy, c-format, no-wrap
+#: src/msgmerge.c:545
+#, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2412,63 +2749,61 @@ msgid ""
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"\n"
 "Fletter sammen to Uniforum .po-filer.  def.po-filen er en eksisterende\n"
-"PO-fil med gamle oversettelser, som vil bli overf�rt til den nye filen\n"
-"dersom de fremdeles stemmer.  Kommentarer blir tatt med, men kommentarer om\n"
-"selve ekstraheringen og fil-posisjoner blir slettet.  ref.po-filen er den\n"
-"sist genererte PO-filen (vanligvis generert med xgettext).  Oversettelser\n"
-"eller kommentarer i denne filen blir slettet, men punktum-kommentarer og\n"
-"fil-posisjoner blir ivaretatt.  Der det ikke lar seg gj�re � finne en\n"
-"eksakt overensstemmelse, blir �fuzzy� sammenligning brukt for � f� bedre\n"
-"resultater.  Resultatet blir skrevet til standard ut, med mindre en utfil\n"
-"er spesifisert.\n"
-
-#: src/msgmerge.c:475
+"PO-fil med gamle oversettelser, som vil bli overført til den nye filen\n"
+"dersom de fremdeles stemmer.  Kommentarer blir tatt med, men kommentarer\n"
+"om selve ekstraheringen og fil-posisjoner blir forkastet.  ref.pot-filen er den\n"
+"sist genererte PO-filen med oppdaterte kildetekster (vanligvis generert med xgettext).\n"
+"Oversettelser eller kommentarer i denne filen blir forkastet, men \n"
+"punktum-kommentarer og fil-posisjoner blir ivaretatt.  Der det ikke lar seg gjøre\n"
+"å finne en eksakt overensstemmelse, blir «fuzzy»-sammenligning brukt for å få bedre\n"
+"resultater.  Resultatet blir skrevet til standard ut.\n"
+
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:568
 #, 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:574
 #, 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:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2480,41 +2815,42 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the "
+"The backup suffix is '~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:610
 #, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
 msgstr ""
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
-#, fuzzy, c-format
+#: src/msgmerge.c:1685
+#, c-format
 msgid "this message should define plural forms"
-msgstr "denne meldingen er brukt, men ikke definert i %s"
+msgstr "denne meldingen bør definere flertallsformer"
 
-#: src/msgmerge.c:1363
-#, fuzzy, c-format
+#: src/msgmerge.c:1706
+#, c-format
 msgid "this message should not define plural forms"
-msgstr "denne meldingen er brukt, men ikke definert i %s"
+msgstr "denne meldingen bør ikke definere flertallsformer"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2110
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2523,61 +2859,63 @@ msgstr ""
 "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
 "foreldete %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " ferdig.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
-#, fuzzy, c-format
+#: 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 %s utelukker hverandre"
+msgstr "%s og eksplisitte filnavn 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 "
@@ -2585,41 +2923,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
-#, fuzzy, c-format
+#: src/msgunfmt.c:467
+#, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "ingen innfil angitt"
+msgstr "Inndatafilplassering i 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 ""
 
-#: 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:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2632,19 +2970,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:366
 #, 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>"
@@ -2658,16 +2996,16 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv(),\n"
-"og iconv() st�tter ikke \"%s\".\n"
+"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
+"og iconv() støtter ikke \"%s\".\n"
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2675,24 +3013,24 @@ msgstr ""
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
+"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2700,289 +3038,344 @@ msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inkonsistent bruk av #~"
 
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:241
 #, c-format
-msgid "missing `msgstr[]' section"
-msgstr "mangler �msgstr[]�-seksjon"
+msgid "missing 'msgstr[]' section"
+msgstr "mangler «msgstr[]»-seksjon"
 
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:250
 #, c-format
-msgid "missing `msgid_plural' section"
-msgstr "mangler �msgid_plural�-seksjon"
+msgid "missing 'msgid_plural' section"
+msgstr "mangler «msgid_plural»-seksjon"
 
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:258
 #, c-format
-msgid "missing `msgstr' section"
-msgstr "mangler �msgstr�-seksjon"
+msgid "missing 'msgstr' section"
+msgstr "mangler «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "f�rste flertallsform har en ikke-null indeks"
+msgstr "første flertallsform har en ikke-null indeks"
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 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:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:466
-#, fuzzy, c-format
+#: src/po-lex.c:465
+#, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "ulovlig multibytesekvens"
+msgstr "ufullstendig multibytesekvens ved slutten av filen"
 
-#: src/po-lex.c:476
-#, fuzzy, c-format
+#: src/po-lex.c:474
+#, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "ulovlig multibytesekvens"
+msgstr "ufullstendig multibytesekvens ved slutten av linjen"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "n�kkelord �%s� ukjent"
+msgstr "nøkkelord «%s» ukjent"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
-msgstr "slutt-p�-fil inne i streng"
+msgstr "slutt-på-fil inne i streng"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
-msgstr "slutt-p�-linje inne i streng"
+msgstr "slutt-på-linje inne i streng"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, 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:370
 msgid "duplicate message definition"
 msgstr "duplisert definisjon av melding"
 
-#: src/read-catalog.c:374
-#, fuzzy
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
-msgstr "... dette er lokasjonen til den f�rste definisjonen"
+msgstr "dette er lokasjonen til den første definisjonen"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, fuzzy, c-format
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, c-format
+msgid "missing '=' after \"%s\""
+msgstr "Mangler «=» etter «%s»"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "ugyldig ikke-blank linje"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
+#, c-format
 msgid "file \"%s\" is truncated"
-msgstr "filen �%s� er avkuttet"
+msgstr "filen «%s» er avkortet"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "filen �%s� inneholder en ikke-NUL-terminert streng"
+msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "filen �%s� er ikke i GNU .mo-format"
+msgstr "filen «%s» er ikke i GNU .mo-format"
 
-#: src/read-mo.c:178
-#, fuzzy, c-format
+#: src/read-mo.c:197
+#, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "filen �%s� inneholder en ikke-NUL-terminert streng"
+msgstr "filen «%s» inneholder en ikke-NUL-terminert streng ved %s"
 
-#: src/read-properties.c:227
-#, fuzzy
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
+msgstr "advarsel: ugyldig \\uxxxx-syntaks for Unicode-tegn"
+
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: advarsel: ensom surrogat U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "advarsel: ugyldig Unicode-tegn"
 
 #: src/read-stringtable.c:802
-#, fuzzy
 msgid "warning: unterminated string"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+msgstr "advarsel: uavsluttet streng"
 
 #: src/read-stringtable.c:810
-#, fuzzy
 msgid "warning: syntax error"
-msgstr "%s:%d: advarsel: n�kkelord n�stet i et annet n�kkelords argument"
+msgstr "advarsel: syntaksfeil"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+msgstr "advarsel: uavsluttet nøkkel/verdipar"
 
-#: src/read-stringtable.c:939
-#, fuzzy
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+msgstr "Advarsel: syntaksfeil, forventet «;» etter streng"
 
 #: src/read-stringtable.c:948
-#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "%s:%d: advarsel: n�kkelord n�stet i et annet n�kkelords argument"
+msgstr "Advarsel: syntaksfeil, forventet «=» eller «;» etter streng"
 
-#: src/recode-sr-latin.c:116
-#, fuzzy, c-format
+#: src/recode-sr-latin.c:115
+#, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Skrevet av %s.\n"
+msgstr "Skrevet av %s og %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:366
-#, fuzzy, c-format
+#: src/recode-sr-latin.c:363
+#, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "feil under �pning av �%s� for lesing"
+msgstr "feil ved konvertering av «%s» til «%s»-omkoding"
 
-#: src/urlget.c:146
-#, fuzzy, c-format
+#: src/urlget.c:158
+#, c-format
 msgid "expected two arguments"
-msgstr "for mange argumenter"
+msgstr "forventet to argumenter"
 
-#: src/urlget.c:163
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:180
 #, 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
-#, fuzzy, c-format
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "feil under lesing av «%s»"
+
+#: src/urlget.c:233
+#, c-format
 msgid "error writing stdout"
-msgstr "feil under skriving av filen �%s�"
+msgstr "feil ved skriving til standard utdata"
+
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "feil etter lesing av «%s»"
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
 
-#: src/write-catalog.c:126
+#: src/write-catalog.c:125
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:129
+#: src/write-catalog.c:128
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:162
+#: src/write-catalog.c:161
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
+#: src/write-catalog.c:196
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
+#: src/write-catalog.c:201
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "kan ikke opprette utfilen �%s�"
+msgstr "kan ikke opprette utfilen «%s»"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "feil under åpning av «%s» for skriving"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "feil under �pning av �%s� for skriving"
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "ufullstendig multibytesekvens"
 
-#: src/write-po.c:766
+#: src/write-po.c:884
 #, c-format
 msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr ""
-"internasjonaliserte meldinger b�r ikke inneholde escape-sekvensen �\\%c�"
+"internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2991,7 +3384,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3000,317 +3393,231 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:94
-#, fuzzy, c-format
+#: src/write-resources.c:96
+#, c-format
 msgid "error while writing to %s subprocess"
-msgstr "feil under skriving av filen �%s�"
+msgstr "feil under skriving til delprosess «%s»"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:133
 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:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
-#, fuzzy, c-format
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
+#, c-format
 msgid "%s:%d: warning: unterminated string"
+msgstr "%s:%d: advarsel: uavsluttet streng"
+
+#: src/x-awk.c:591
+#, c-format
+msgid "%s:%d: warning: unterminated regular expression"
+msgstr "%s:%d: advarsel: uavsluttet regulært uttrykk"
+
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: advarsel: ugyldig Unicode-tegn"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-awk.c:593
+#: src/x-c.c:1432
 #, fuzzy, c-format
-msgid "%s:%d: warning: unterminated regular expression"
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
 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:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1654 src/x-vala.c:907
 #, 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:225
+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-javascript.c:321 src/x-python.c:375
 #, 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
-#, 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
-#, fuzzy, c-format
+#: src/x-csharp.c:1451 src/x-java.c:668
+#, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+msgstr "%s:%d: advarsel: uavsluttet strengkonstant"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, 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:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:645
-#, fuzzy, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-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
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/x-perl.c:307
-#, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-
-#: src/x-perl.c:1038
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
-
-#: src/x-perl.c:1158
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1178
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1212
-#, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: ugyldig flagg -- %c\n"
-
-#: src/x-perl.c:1225
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1242
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/x-python.c:233
+#: src/xgettext.c:637
 #, c-format
-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 ""
+msgid "syntax check '%s' unknown"
+msgstr "syntakssjekk «%s» er ukjent"
 
-#: src/x-python.c:281
+#: src/xgettext.c:646
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/xgettext.c:701
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-
-#: src/x-python.c:311
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-
-#: src/x-python.c:321
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-
-#: src/x-python.c:354
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\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:674
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+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/x-rst.c:109
+#: src/xgettext.c:705
 #, c-format
-msgid "%s:%d: invalid string definition"
-msgstr ""
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
-#: src/x-rst.c:173
+#: src/xgettext.c:839
 #, c-format
-msgid "%s:%d: missing number after #"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-rst.c:208
-#, fuzzy, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/x-sh.c:1075
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:938
 #, 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
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext kan ikke arbeide uten � finne n�kkelord"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgstr "advarsel: filtypen til «%s» med endelsen «%s» er ukjent, forsøker C"
 
-#: src/xgettext.c:715
-#, 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:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:1050
 #, 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:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:1054
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
-#, fuzzy, c-format
+#: src/xgettext.c:1059
+#, c-format
 msgid "Choice of input file language:\n"
-msgstr "ingen innfil angitt"
+msgstr "Valg av språk for inndata-fil:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:1061
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3319,77 +3626,101 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:1070
 #, 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:1075
 #, 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:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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:1092
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3397,180 +3728,501 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
 #, 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:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:1146
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:1190
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:1198
 #, 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:1201
 #, 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:1597
 #, 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:1695
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
-#, fuzzy, c-format
-msgid "%s%s: warning: "
-msgstr "%s: advarsel: "
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "språket «%s» er ukjent"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:1968
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:919
+#, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: advarsel: Regeluttrykk avsluttet bokstavelig talt for tidlig"
+
+#: src/x-javascript.c:1027
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: advarsel: %s er ikke tillat"
+
+#: src/x-javascript.c:1041
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: advarsel: uterminert XML kode"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr ""
+
+#: src/x-perl.c:1074
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr ""
+
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: ugyldig variabel-interpolering ved «%c»"
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/x-python.c:279
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/x-python.c:325
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/x-python.c:342
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/x-python.c:355
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/x-python.c:365
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/x-python.c:398
+#, c-format
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr ""
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: ugyldig strenguttrykk "
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string expression"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ugyldig strenguttrykk "
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string expression"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ugyldig strenguttrykk "
+
+#: src/x-rst.c:691
 #, c-format
-msgid "language `%s' unknown"
-msgstr "spr�ket �%s� er ukjent"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#: src/x-vala.c:616
+#, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: advarsel: regulært uttrykk avsluttet for tidlig"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "ugyldig UTF-8-sekvens"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr ""
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, c-format
+msgid "invalid character reference: %s"
+msgstr "ugyldig tegnreferanse: %s"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, c-format
+msgid "invalid entity reference: %s"
+msgstr "ugyldig entitetsreferanse: %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr ""
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "inne i et attributtnavn "
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, fuzzy, c-format
+#~| msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flagget «--%s» tillater ikke argumenter\n"
+
+#, fuzzy, c-format
+#~| msgid "%s: unrecognized option `--%s'\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ukjent flagg «--%s»\n"
+
+#, fuzzy, c-format
+#~| msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: flagg «-W %s» er flertydig\n"
+
+#, 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: flagg «-W %s» tillater ikke et argument\n"
+
+#, fuzzy, c-format
+#~| msgid "%s: option `%s' requires an argument\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: flagget «%s» krever et argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "advarsel: PO-filhode uklar\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: advarsel: "
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovlig flagg -- %c\n"
+
+#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
+#~ "Denne versjonen ble blygget uten iconv().\n"
+
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
 #~ msgid ""
@@ -3585,7 +4237,7 @@ msgstr ""
 #~ "finnes\n"
 #~ "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET "
 #~ "BESTEMT\n"
-#~ "FORM�L.\n"
+#~ "FORMÅL.\n"
 
 #~ msgid "%s: warning: "
 #~ msgstr "%s: advarsel: "
@@ -3624,12 +4276,12 @@ msgstr ""
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
-#~ "Bruksm�te: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+#~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 #~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
-#~ "  -D, --directory=KATALOG     legge KATALOG til s�kelisten over innfiler\n"
+#~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
 #~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
 #~ "(standard)\n"
 #~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
@@ -3638,8 +4290,8 @@ msgstr ""
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
 #~ "  -o, --output-file=FIL       resultat vil bli skrevet til FIL\n"
-#~ "      --no-location           undertrykk �#: filnavn:linje�-linjer\n"
-#~ "      --add-location          bevar �#: filnavn:linje�-linjer (standard)\n"
+#~ "      --no-location           undertrykk «#: filnavn:linje»-linjer\n"
+#~ "      --add-location          bevar «#: filnavn:linje»-linjer (standard)\n"
 #~ "      --strict                lag streng Uniforum-konform utdata\n"
 #~ "  -v, --verbose               gi mer fyldige meldinger\n"
 #~ "  -V, --version               skriv ut programversjon og avslutt\n"
@@ -3663,12 +4315,12 @@ msgstr ""
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Bruksm�te: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+#~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 #~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
-#~ "  -D, --directory=KATALOG     legge KATALOG til s�kelisten over innfiler\n"
+#~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
 #~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
 #~ "(standard)\n"
 #~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
@@ -3677,8 +4329,8 @@ msgstr ""
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
 #~ "  -o, --output-file=FIL       resultat vil bli skrevet til FIL\n"
-#~ "      --no-location           undertrykk �#: filnavn:linje�-linjer\n"
-#~ "      --add-location          bevar �#: filnavn:linje�-linjer (standard)\n"
+#~ "      --no-location           undertrykk «#: filnavn:linje»-linjer\n"
+#~ "      --add-location          bevar «#: filnavn:linje»-linjer (standard)\n"
 #~ "      --strict                lag streng Uniforum-konform utdata\n"
 #~ "  -v, --verbose               gi mer fyldige meldinger\n"
 #~ "  -V, --version               skriv ut programversjon og avslutt\n"
@@ -3704,12 +4356,12 @@ msgstr ""
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Bruksm�te: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+#~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 #~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
-#~ "  -D, --directory=KATALOG     legge KATALOG til s�kelisten over innfiler\n"
+#~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
 #~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
 #~ "(standard)\n"
 #~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
@@ -3718,8 +4370,8 @@ msgstr ""
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
 #~ "  -o, --output-file=FIL       resultat vil bli skrevet til FIL\n"
-#~ "      --no-location           undertrykk �#: filnavn:linje�-linjer\n"
-#~ "      --add-location          bevar �#: filnavn:linje�-linjer (standard)\n"
+#~ "      --no-location           undertrykk «#: filnavn:linje»-linjer\n"
+#~ "      --add-location          bevar «#: filnavn:linje»-linjer (standard)\n"
 #~ "      --strict                lag streng Uniforum-konform utdata\n"
 #~ "  -v, --verbose               gi mer fyldige meldinger\n"
 #~ "  -V, --version               skriv ut programversjon og avslutt\n"
@@ -3743,12 +4395,12 @@ msgstr ""
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
-#~ "Bruksm�te: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+#~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 #~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
-#~ "  -D, --directory=KATALOG     legge KATALOG til s�kelisten over innfiler\n"
+#~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
 #~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
 #~ "(standard)\n"
 #~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
@@ -3757,8 +4409,8 @@ msgstr ""
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
 #~ "  -o, --output-file=FIL       resultat vil bli skrevet til FIL\n"
-#~ "      --no-location           undertrykk �#: filnavn:linje�-linjer\n"
-#~ "      --add-location          bevar �#: filnavn:linje�-linjer (standard)\n"
+#~ "      --no-location           undertrykk «#: filnavn:linje»-linjer\n"
+#~ "      --add-location          bevar «#: filnavn:linje»-linjer (standard)\n"
 #~ "      --strict                lag streng Uniforum-konform utdata\n"
 #~ "  -v, --verbose               gi mer fyldige meldinger\n"
 #~ "  -V, --version               skriv ut programversjon og avslutt\n"
@@ -3797,12 +4449,12 @@ msgstr ""
 #~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
 #~ "entries\n"
 #~ msgstr ""
-#~ "Bruksm�te: %s [FLAGG] def.po ref.po\n"
-#~ "Obligatoriske argumenter til lange flagg er ogs� obligatoriske for korte "
+#~ "Bruksmåte: %s [FLAGG] def.po ref.po\n"
+#~ "Obligatoriske argumenter til lange flagg er også obligatoriske for korte "
 #~ "flagg.\n"
 #~ "  -C  --compendium=FIL        ytterligere bibliotek med oversettelser,\n"
 #~ "                              kan bli angitt mer enn en gang\n"
-#~ "  -D, --directory=KATALOG     legge KATALOG til s�kelisten over innfiler\n"
+#~ "  -D, --directory=KATALOG     legge KATALOG til søkelisten over innfiler\n"
 #~ "  -e, --no-escape             ikke bruke C-escapekoder i utdata "
 #~ "(standard)\n"
 #~ "  -E, --escape                bruk C-escaper i utdata, ingen utvidede "
@@ -3811,8 +4463,8 @@ msgstr ""
 #~ "  -h, --help                  vise denne hjelpen og avslutte\n"
 #~ "  -i, --indent                innrykk i utdata\n"
 #~ "  -o, --output-file=FIL       resultat vil bli skrevet til FIL\n"
-#~ "      --no-location           undertrykk �#: filnavn:linje�-linjer\n"
-#~ "      --add-location          bevar �#: filnavn:linje�-linjer (standard)\n"
+#~ "      --no-location           undertrykk «#: filnavn:linje»-linjer\n"
+#~ "      --add-location          bevar «#: filnavn:linje»-linjer (standard)\n"
 #~ "      --strict                lag streng Uniforum-konform utdata\n"
 #~ "  -v, --verbose               gi mer fyldige meldinger\n"
 #~ "  -V, --version               skriv ut programversjon og avslutt\n"
@@ -3834,10 +4486,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=TEXTDOMAIN   hent oversatte meldinger fra TEXTDOMAIN\n"
-#~ "  -e                        sl� p� ekspandering av noen escape-sekvenser\n"
+#~ "  -e                        slå på ekspandering av noen escape-sekvenser\n"
 #~ "  -E                        (tillatt av kompatibilitetshensyn)\n"
 #~ "  -h, --help                vis denne hjelpeteksten og avslutt\n"
-#~ "  -n                        undertrykk etterf�lgende linjeskift\n"
+#~ "  -n                        undertrykk etterfølgende linjeskift\n"
 #~ "  -v, --version             vis programversjon og avslutt\n"
 #~ "  [TEXTDOMAIN] MSGID        hent oversatt melding som stemmer overens med "
 #~ "MSGID\n"
@@ -3861,13 +4513,14 @@ msgstr ""
 #~ msgstr ""
 #~ "\n"
 #~ "Dersom TEXTDOMAIN-parameteren ikke er gitt, blir domenet valgt fra\n"
-#~ "milj�variabelen TEXTDOMAIN.  Dersom meldingskatalogen ikke finnes i den\n"
+#~ "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"
+#~ "miljøvariabelen TEXTDOMAIN.\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"
+#~ "Standard søkekatalog er: %s\n"
 
 #, fuzzy
 #~ msgid ""
@@ -3884,14 +4537,14 @@ msgstr ""
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 #~ "  -d, --domain=TEXTDOMAIN   hent oversatte meldinger fra TEXTDOMAIN\n"
-#~ "  -e                        sl� p� ekspandering av noen escape-sekvenser\n"
+#~ "  -e                        slå på ekspandering av noen escape-sekvenser\n"
 #~ "  -E                        (tillatt av kompatibilitetshensyn)\n"
 #~ "  -h, --help                vis denne hjelpeteksten og avslutt\n"
 #~ "  -v, --version             vis programversjon og avslutt\n"
 #~ "  [TEXTDOMAIN]              hent oversatt melding fra TEXTDOMAIN\n"
 #~ "  MSGID MSGID-PLURAL        oversett MSGID (entall) / MSGID-PLURAL "
 #~ "(flertall)\n"
-#~ "  COUNT                     velg entalls-/flertallsform basert p� denne "
+#~ "  COUNT                     velg entalls-/flertallsform basert på denne "
 #~ "verdien\n"
 
 #, fuzzy
@@ -3907,17 +4560,13 @@ msgstr ""
 #~ msgstr ""
 #~ "\n"
 #~ "Dersom TEXTDOMAIN-parameteren ikke er gitt, blir domenet valgt fra\n"
-#~ "milj�variabelen TEXTDOMAIN.  Dersom meldingskatalogen ikke finnes i den\n"
+#~ "miljøvariabelen TEXTDOMAIN.  Dersom meldingskatalogen ikke finnes i den\n"
 #~ "vanlige katalogen, kan en annen katalog spesifiseres ved hjelp av\n"
-#~ "milj�variabelen TEXTDOMAINDIR.\n"
-#~ "Standard s�kekatalog er: %s\n"
-
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "filen �%s� inneholder en ikke-NUL-terminert streng"
+#~ "miljøvariabelen TEXTDOMAINDIR.\n"
+#~ "Standard søkekatalog er: %s\n"
 
 #~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "�seek� �%s� posisjon %ld mislyktes"
+#~ msgstr "«seek» «%s» posisjon %ld mislyktes"
 
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
@@ -3936,13 +4585,13 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
-#~ msgstr "%s:%d: advarsel: n�kkelord mellom ytre n�kkelord og dets argument"
+#~ msgstr "%s:%d: advarsel: nøkkelord mellom ytre nøkkelord og dets argument"
 
 #~ msgid "while preparing output"
-#~ msgstr "under klargj�ring av utdata"
+#~ msgstr "under klargjøring av utdata"
 
 #~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "denne meldingen har ingen definisjon i �%s�-domenet"
+#~ msgstr "denne meldingen har ingen definisjon i «%s»-domenet"
 
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
@@ -3963,17 +4612,17 @@ msgstr ""
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "  -i, --indent                   skrive ut .po-filen med innrykk\n"
-#~ "      --no-location              ikke skriv �#: filnavn:linje�-linjer\n"
-#~ "  -n, --add-location             genererer �#: filnavn:linje�-linjer "
+#~ "      --no-location              ikke skriv «#: filnavn:linje»-linjer\n"
+#~ "  -n, --add-location             genererer «#: filnavn:linje»-linjer "
 #~ "(standard)\n"
-#~ "      --omit-header              ikke skriv hode med �msgid �\n"
+#~ "      --omit-header              ikke skriv hode med «msgid »\n"
 #~ "  -o, --output=FIL               skriv utdata til angitt FIL\n"
 #~ "  -p, --output-dir=KAT           utfiler plasseres i katalogen KAT\n"
 #~ "  -s, --sort-output              generer sortert utdata og fjern "
 #~ "duplikater\n"
 #~ "      --strict                   skriv ut streng Uniforum-konform .po-"
 #~ "fil\n"
-#~ "  -T, --trigraphs                forst� ANSI C trigraphs i inndata\n"
+#~ "  -T, --trigraphs                forstå ANSI C trigraphs i inndata\n"
 #~ "  -u, --unique                   kortform --less-than=2, krever\n"
 #~ "                                 at bare unike meldinger blir skrevet ut\n"
 
@@ -3985,7 +4634,7 @@ msgstr ""
 #~ "By default the output is written to standard output.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Konverter bin�re .mo-filer til Uniforum .po-filer.\n"
-#~ "B�de �little-endian� og �big-endian� .mo-filer blir h�ndtert.\n"
+#~ "Konverter binære .mo-filer til Uniforum .po-filer.\n"
+#~ "Både «little-endian» og «big-endian» .mo-filer blir håndtert.\n"
 #~ "Dersom innfil er -, blir standard inn lest.\n"
 #~ "Dersom intet annet er spesifisert, blir det skrevet til standard ut.\n"
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index 74e0c1b4a..f5fb6176e 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -8,30 +8,31 @@
 # Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2014, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools-0.19.6.43\n"
+"Project-Id-Version: gettext-tools-0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-11 12:54+0900\n"
-"PO-Revision-Date: 2016-05-30 21:52+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-10-05 20:35+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"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "ongeldig argument %s van %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argument %s van %s is niet eenduidig"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Geldige argumenten zijn:"
 
@@ -59,152 +60,133 @@ msgstr "kan tijdelijke map '%s' niet verwijderen"
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "behouden van toegangsrechten van %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "fout bij openen van %s voor lezen"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "kan reservekopiebestand %s niet openen voor schrijven"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "fout bij lezen van %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "fout bij schrijven van %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "fout na lezen van %s"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() is mislukt"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "subproces %s is mislukt"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: onbekende optie '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: optie '--%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: onbekende optie '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: onbekende optie '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: optie '-W %s' is niet eenduidig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '-W %s' vereist een argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "aanmaken van '%s' is mislukt"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven van bestand '%s'"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
@@ -214,46 +196,46 @@ 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:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "In-/uitvoerfout in subproces %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "aanmaken van threads is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "schrijven naar subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lezen uit subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "kan geen niet-blokkerende in-/uitvoer instellen naar subproces %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communicatie met subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "subproces %s is geëindigd met afsluitwaarde %d"
@@ -277,13 +259,13 @@ msgstr "subproces %s is geëindigd met afsluitwaarde %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "‘"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "’"
 
@@ -292,64 +274,69 @@ msgstr "’"
 msgid "setting permissions for %s"
 msgstr "instellen van toegangsrechten van %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan geen pijp aanmaken"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle() is mislukt"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "subproces %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subproces %s ontving het fatale signaal %d"
 
-#: src/cldr-plurals.c:69
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "The root element <%s> is not allowed in a valid CLDR file"
+msgid "Could not parse file %s as XML"
 msgstr ""
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr "Het hoofdelement moet <%s> zijn"
+
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
-msgstr ""
+msgstr "Element <%s> bevat geen <%s> element"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
-msgstr ""
+msgstr "Element <%s> heeft geen eigenschap <%s>"
 
-#: src/cldr-plurals.c:189 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/cldr-plurals.c:193
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [TAALREGIO REGELS]...\n"
 
-#: src/cldr-plurals.c:198
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -365,7 +352,7 @@ msgstr ""
 "gettext.  Als er geen argumenten gegeven zijn, dan worden de meervoudsregels\n"
 "van standaardinvoer gelezen.\n"
 
-#: src/cldr-plurals.c:207 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,27 +361,27 @@ msgstr ""
 "Een verplicht of optioneel argument bij een lange optie\n"
 "geldt ook voor de korte vorm.\n"
 
-#: src/cldr-plurals.c:212
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr          meervoudsregels weergeven in CLDR-opmaak\n"
 
-#: src/cldr-plurals.c:214 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version       programmaversie tonen en stoppen\n"
@@ -403,27 +390,32 @@ 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/cldr-plurals.c:223 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
 "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: src/cldr-plurals.c:287 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -433,11 +425,11 @@ 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/cldr-plurals.c:293 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
@@ -467,43 +459,44 @@ msgstr "Kan CLDR-regel niet ontleden"
 msgid "extra operand %s"
 msgstr "overtollige operand: %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fout bij openen van '%s' voor lezen"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "een opmaakcode voor argument %u, als in '%s', komt niet voor in '%s'"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "een opmaakcode voor argument %u komt niet voor in '%s'"
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "opmaakcodes in '%s' en '%s' voor argument %u zijn niet hetzelfde"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Directief nummer %u begint met | maar eindigt niet op |."
@@ -513,57 +506,73 @@ msgstr "Directief nummer %u begint met | maar eindigt niet op |."
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' is geen geldige opmaakreeks voor %s, anders dan '%s'.  Reden: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "In directief nummer %u is de tekenreeks na '<' niet de naam van een opmaakcodemacro.  Geldige macronamen staan opgesomd in ISO C 99, paragraaf 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"In directief nummer %u is de tekenreeks na '<' niet de naam van een "
+"opmaakcodemacro.  Geldige macronamen staan opgesomd in ISO C 99, paragraaf "
+"7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "In directief nummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
+msgstr ""
+"In directief nummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "De tekenreeks verwijst naar argumentnummer %u maar negeert argumentnummer %u."
+msgstr ""
+"De tekenreeks verwijst naar argumentnummer %u maar negeert argumentnummer %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "het aantal opmaakcodes in '%s' en '%s' is niet gelijk"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "In directief nummer %u wordt '{' niet gevolgd door een argumentnummer."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "In directief nummer %u wordt ',' niet gevolgd door een nummer."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "De tekenreeks stopt midden in een directief: '{' gevonden zonder gepaarde '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"De tekenreeks stopt midden in een directief: '{' gevonden zonder gepaarde "
+"'}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Het directief nummer %u eindigt op ongeldig teken '%c' in plaats van '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Het directief nummer %u eindigt op ongeldig teken '%c' in plaats van '}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Het directief nummer %u eindigt op een ongeldig teken in plaats van '}'."
+msgstr ""
+"Het directief nummer %u eindigt op een ongeldig teken in plaats van '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "De tekenreeks begint midden in een directief: '}' gevonden zonder gepaarde '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"De tekenreeks begint midden in een directief: '}' gevonden zonder gepaarde "
+"'{'."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "De tekenreeks bevat een ongepaarde '}' na directief nummer %u."
@@ -576,17 +585,27 @@ msgstr "In directief nummer %u is de combinatie van vlaggen ongeldig."
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "In directief nummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
+msgstr ""
+"In directief nummer %u is geen nauwkeurigheidsaanduiding voor '%c' "
+"toegestaan."
 
 #: 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 "In directief nummer %u moet het argumentnummer voor de nauwkeurigheid gelijk zijn aan %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"In directief nummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
+"zijn aan %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "In directief nummer %u is geen nauwkeurigheidsspecificatie toegestaan voor '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"In directief nummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
+"'%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -596,7 +615,8 @@ msgstr "In directief nummer %u is de nauwkeurigheidsspecificatie ongeldig."
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "In directief nummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
+msgstr ""
+"In directief nummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
 
 #: src/format-gcc-internal.c:677
 #, c-format
@@ -623,93 +643,136 @@ msgid "The string ends in the middle of a directive."
 msgstr "De tekenreeks stopt midden in een directief."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "De tekenreeks verwijst naar argumenten zowel via absolute argumentnummers als via ongenummerde argumentspecificaties."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"De tekenreeks verwijst naar argumenten zowel via absolute argumentnummers "
+"als via ongenummerde argumentspecificaties."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "In directief nummer %u is argumentnummer 0 geen positief geheel getal."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "In directief nummer %u is de breedte's argumentnummer 0 geen positief geheel getal."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"In directief nummer %u is de breedte's argumentnummer 0 geen positief geheel "
+"getal."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "In directief nummer %u is de nauwkeurigheid's argumentnummer 0 geen positief geheel getal."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"In directief nummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
+"geheel getal."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "In directief nummer %u is teken '%c' geen geldige conversiespecificatie."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"In directief nummer %u is teken '%c' geen geldige conversiespecificatie."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Het teken waarmee directief nummer %u afsluit is geen geldige conversiespecificatie."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Het teken waarmee directief nummer %u afsluit is geen geldige "
+"conversiespecificatie."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "De tekenreeks verwijst naar argumentnummer %u op niet-compatibele manieren."
+msgstr ""
+"De tekenreeks verwijst naar argumentnummer %u op niet-compatibele manieren."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "In directief nummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"In directief nummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "In directief nummer %u wordt \"%s\" niet gevolgd door een komma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "In directief nummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"In directief nummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "In directief nummer %u wordt het argumentnummer niet gevolgd door een komma en één van \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"In directief nummer %u wordt het argumentnummer niet gevolgd door een komma "
+"en één van \"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "In directief nummer %u bevat een keuze geen getal."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "In directief nummer %u bevat een keuze een getal dat niet gevolgd wordt door '<', '#' of '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"In directief nummer %u bevat een keuze een getal dat niet gevolgd wordt door "
+"'<', '#' of '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "een opmaakcode voor argument {%u}, als in '%s', komt niet voor in '%s'"
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "een opmaakcode voor argument {%u} komt niet voor in '%s'"
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "opmaakcodes in '%s' en '%s' voor argument {%u} zijn niet hetzelfde"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "De tekenreeks verwijst naar argumentnummer %u maar negeert argumenten %u and %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"De tekenreeks verwijst naar argumentnummer %u maar negeert argumenten %u and "
+"%u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "voor argumenten %u en %u komt er geen opmaakcode voor in '%s'; slechts één argument mag genegeerd worden"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"voor argumenten %u en %u komt er geen opmaakcode voor in '%s'; slechts één "
+"argument mag genegeerd worden"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -720,15 +783,27 @@ msgstr "fout tijdens ontleden van '%s'"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "In directief nummer %u is parameter %u van type '%s' maar wordt een parameter van type '%s' verwacht."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"In directief nummer %u is parameter %u van type '%s' maar wordt een "
+"parameter van type '%s' verwacht."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "In directief nummer %u zijn te veel parameters opgegeven; maximaal %u parameter wordt verwacht."
-msgstr[1] "In directief nummer %u zijn te veel parameters opgegeven; maximaal %u parameters worden verwacht."
+msgid ""
+"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."
+msgstr[0] ""
+"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
+"parameter wordt verwacht."
+msgstr[1] ""
+"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
+"parameters worden verwacht."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -758,8 +833,12 @@ msgstr "In directief nummer %u zijn zowel de @- en de :-aanpastekens gegeven."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "In directief nummer %u is '~:[' niet gevolgd door twee clausules, gescheiden door een '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"In directief nummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
+"door een '~;'."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -768,7 +847,8 @@ msgstr "In directief nummer %u is '~;' gebruikt op een onjuiste positie."
 
 #: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr "De tekenreeks verwijst naar enig argument op niet-compatibele manieren."
+msgstr ""
+"De tekenreeks verwijst naar enig argument op niet-compatibele manieren."
 
 #: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
@@ -780,157 +860,195 @@ msgstr "de opmaakcodes in '%s' en '%s' zijn niet gelijkwaardig"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "de opmaakcodes in '%s' zijn geen subset van die in '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "opmaakcode voor argument '%s' komt niet voor in '%s'"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "In directief nummer %u is de groottespecificatie niet-compatibel met de conversiespecificatie '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"In directief nummer %u is de groottespecificatie niet-compatibel met de "
+"conversiespecificatie '%c'."
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "In directief nummer %u kan '%c' geen veldnaam beginnen."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "In directief nummer %u kan '%c' geen 'getattr'-argument beginnen."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "In directief nummer %u kan '%c' geen 'getitem'-argument beginnen."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "In directief nummer %u is geen nesting meer toegestaan in een opmaakcode."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"In directief nummer %u is geen nesting meer toegestaan in een opmaakcode."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "In directief nummer %u is er een onafgemaakte opmaakcode."
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "De tekenreeks verwijst naar argumenten zowel via argumentnamen als via onbenoemde argumentspecificaties."
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"De tekenreeks verwijst naar argumenten zowel via argumentnamen als via "
+"onbenoemde argumentspecificaties."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "De tekenreeks verwijst naar het argument genaamd '%s' op niet-compatibele wijze."
+msgstr ""
+"De tekenreeks verwijst naar het argument genaamd '%s' op niet-compatibele "
+"wijze."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "de opmaakcodes in '%s' verwachten een afbeelding, die in '%s' een tupel"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"de opmaakcodes in '%s' verwachten een afbeelding, die in '%s' een tupel"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "de opmaakcodes in '%s' verwachten een tupel, die in '%s' een afbeelding"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"de opmaakcodes in '%s' verwachten een tupel, die in '%s' een afbeelding"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "de opmaakcodes in '%s' en '%s' voor argument '%s' zijn niet hetzelfde"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een 'L'-vlag of een argumentnummer met dubbele cijfers"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een 'L'-"
+"vlag of een argumentnummer met dubbele cijfers"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "De tekenreeks verwijst naar een shell-variabele met een niet-ASCII-naam."
+msgstr ""
+"De tekenreeks verwijst naar een shell-variabele met een niet-ASCII-naam."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "De tekenreeks verwijst naar een shell-variabele met een een gecompliceerde accolade-expansie.  Om veiligheidsredenen wordt deze syntax hier niet ondersteund."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"De tekenreeks verwijst naar een shell-variabele met een een gecompliceerde "
+"accolade-expansie.  Om veiligheidsredenen wordt deze syntax hier niet "
+"ondersteund."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "De tekenreeks verwijst naar een shell-variabele waarvan de waarde binnen shell-functies kan wijzigen."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"De tekenreeks verwijst naar een shell-variabele waarvan de waarde binnen "
+"shell-functies kan wijzigen."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "De tekenreeks verwijst naar een shell-variabele met een lege naam."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "In directief nummer %u is teken '%c' geen cijfer tussen 1 en 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Het teken waarmee directief nummer %u afsluit is geen cijfer tussen 1 en 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Het teken waarmee directief nummer %u afsluit is geen cijfer tussen 1 en 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "De hostnaam van de machine tonen.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Opmaak van de uitvoer:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 korte hostnaam\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "kan hostnaam niet verkrijgen"
@@ -940,7 +1058,7 @@ msgstr "kan hostnaam niet verkrijgen"
 msgid "selector is not specified"
 msgstr "selector is niet opgegeven"
 
-#: src/its.c:326 src/its.c:1548
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "kan XPath-context niet aanmaken"
@@ -950,28 +1068,28 @@ msgstr "kan XPath-context niet aanmaken"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "kan XPath-expressie niet evalueren: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "\"%s\"-node bevat geen \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "ongeldige eigenschapswaarde \"%s\" voor \"%s\""
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
-msgstr ""
+msgstr "het hoofdelement is niet \"rules\" onder naamsruimte %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1793 src/its.c:1912
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan %s niet lezen: %s"
 
-#: src/its.c:1571
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "kan XPath-locatiepad niet evalueren: %s"
@@ -991,28 +1109,28 @@ msgstr "kan XML-bestand %s niet lezen"
 msgid "the root element is not \"locatingRules\""
 msgstr "het hoofdelement is niet \"locatingRules\""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s en %s sluiten elkaar uit"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1021,314 +1139,357 @@ msgstr ""
 "Filtert de berichten van een vertalingenbestand aan de hand van hun\n"
 "eigenschappen, en manipuleert die eigenschappen.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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"
+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:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=MAP         deze map toevoegen aan lijst van te doorzoeken mappen\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=MAP         deze map toevoegen aan lijst van te doorzoeken "
+"mappen\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Zonder invoerbestand, of als deze '-' is, wordt standaardinvoer gelezen.\n"
+msgstr ""
+"Zonder invoerbestand, of als deze '-' is, wordt standaardinvoer gelezen.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=BESTAND   de uitvoer naar gegeven bestand schrijven\n"
+msgstr ""
+"  -o, --output-file=BESTAND   de uitvoer naar gegeven bestand schrijven\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"De resultaten worden naar standaarduitvoer geschreven als er geen uitvoerbestand\n"
+"De resultaten worden naar standaarduitvoer geschreven als er geen "
+"uitvoerbestand\n"
 "gegeven is of als deze '-' is.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Berichtenselectie:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            vertaalde berichten behouden, onvertaalde weglaten\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            vertaalde berichten behouden, onvertaalde "
+"weglaten\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          onvertaalde berichten behouden, vertaalde weglaten\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          onvertaalde berichten behouden, vertaalde "
+"weglaten\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              de met 'fuzzy' gemarkeerde berichten weglaten\n"
+msgstr ""
+"      --no-fuzzy              de met 'fuzzy' gemarkeerde berichten weglaten\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            alleen met 'fuzzy' gemarkeerde berichten behouden\n"
+msgstr ""
+"      --only-fuzzy            alleen met 'fuzzy' gemarkeerde berichten "
+"behouden\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           verouderder berichten (#~) weglaten\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         alleen verouderde berichten (#~) behouden\n"
+msgstr ""
+"      --only-obsolete         alleen verouderde berichten (#~) behouden\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulatie van eigenschappen:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             alle berichten met 'fuzzy' markeren\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           bij alle berichten eventuele 'fuzzy' weghalen\n"
+msgstr ""
+"      --clear-fuzzy           bij alle berichten eventuele 'fuzzy' weghalen\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          alle berichten als verouderd (#~) markeren\n"
+msgstr ""
+"      --set-obsolete          alle berichten als verouderd (#~) markeren\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        bij alle berichten '#~' weghalen\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              bij het markeren met 'fuzzy', de msgid die echt\n"
+"      --previous              bij het markeren met 'fuzzy', de msgid die "
+"echt\n"
 "                                bij de msgstr hoorde behouden\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr "      --clear-previous        eventuele originele msgids weglaten\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 bij weglaten van 'fuzzy' ook de msgstr leegmaken\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 bij weglaten van 'fuzzy' ook de msgstr "
+"leegmaken\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=BESTAND.po  alleen items manipuleren die in dit bestand staan\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=BESTAND.po  alleen items manipuleren die in dit bestand "
+"staan\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=BESTAND.po  alleen items manipuleren die in dit bestand\n"
 "                                  niet voorkomen\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 hetzelfde als '--only-fuzzy --clear-fuzzy'\n"
+msgstr ""
+"      --fuzzy                 hetzelfde als '--only-fuzzy --clear-fuzzy'\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              hetzelfde als '--only-obsolete --clear-obsolete'\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              hetzelfde als '--only-obsolete --clear-"
+"obsolete'\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax van invoerbestand:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "onmogelijke selectiecriteria opgegeven (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1342,95 +1503,97 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Als invoerbestand '-' is, dan wordt standaardinvoer gelezen.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: 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:412
+#: 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:415 src/msgcomm.c:406
+#: 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:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --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:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "geen invoerbestanden gegeven"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precies twee invoerbestanden zijn vereist"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Gebruik:  %s [OPTIE...] bestaande.po referentie.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1448,84 +1611,86 @@ msgstr ""
 "programma vertaald zijn.  Wanneer er geen exacte overeenkomst is, wordt er\n"
 "ook naar vage gelijkenissen gekeken, om een betere diagnose te kunnen geven.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  bestaande.po                bestaand bestand met vertalingen\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  referentie.pot              verwijzingen naar de programmatekst\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr ""
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "dit bericht is onvertaald"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "dit bericht moet door een vertaler gecontroleerd worden"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...maar deze definitie lijkt erop"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "waarschuwing: dit bericht wordt niet gebruikt"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d fatale fout gevonden"
 msgstr[1] "%d fatale fouten gevonden"
 
-#: src/msgcomm.c:317
+#: 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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1538,72 +1703,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: 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:453 src/xgettext.c:1209
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "precies één invoerbestand is vereist"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Gebruik:  %s [OPTIE...] INVOERBESTAND\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1612,22 +1779,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "ontbrekende opdrachtnaam"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...] OPDRACHT [OPDRACHTOPTIE...]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1637,54 +1804,54 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Opdrachtinvoer:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "schrijven naar standaarduitvoer is mislukt"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "ontbrekende filternaam"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "er moet minstens één sed-script gegeven worden"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Past een filter toe op alle vertalingen in een PO-bestand.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1693,56 +1860,61 @@ msgstr ""
 "Het FILTER kan elk programma zijn dat een bericht van standaardinvoer leest\n"
 "en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr ""
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
 msgstr ""
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "filteruitvoer wordt niet door een regeleindeteken afgesloten"
@@ -1758,23 +1930,24 @@ msgid "invalid endianness: %s"
 msgstr "ongeldige endian-waarde: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 #: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
-msgstr "er hoort geen invoerbestand gegeven te zijn wanneer %s en %s gegeven zijn"
+msgstr ""
+"er hoort geen invoerbestand gegeven te zijn wanneer %s en %s gegeven zijn"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vereist een optie \"-d MAP\""
 
 #: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vereist een optie \"-l TAALREGIO\""
@@ -1794,7 +1967,7 @@ msgstr "%s vereist een optie \"-o BESTAND\""
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s en %s sluiten elkaar uit in %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is alleen geldig samen met %s of %s"
@@ -1804,380 +1977,403 @@ msgstr "%s is alleen geldig samen met %s of %s"
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is alleen geldig samen met %s, %s of %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan ITS-regels voor %s niet vinden"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d vertaald bericht"
 msgstr[1] "%d vertaalde berichten"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vage gelijkenis"
 msgstr[1] ", %d vage gelijkenissen"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d onvertaald bericht"
 msgstr[1] ", %d onvertaalde berichten"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Genereert een binaire berichtencatalogus uit een vertalingenbestand.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Als het uitvoerbestand '-' is, dan wordt naar standaarduitvoer geschreven.\n"
+msgstr ""
+"Als het uitvoerbestand '-' is, dan wordt naar standaarduitvoer geschreven.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locatie van uitvoerbestand in Java-modus:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:981
 #, 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:997
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locatie van uitvoerbestand in Tcl-modus:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:991
 #, 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:1007
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, 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/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "waarschuwing: PO-kopregels ontbreken of zijn ongeldig\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "waarschuwing: tekensetconversie zal niet werken\n"
 
-#: src/msgfmt.c:1212
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
-
-#: src/msgfmt.c:1214
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "waarschuwing: oudere versies van 'msgfmt' vinden dit een fout\n"
-
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam: voorvoegsel wordt gebruikt"
+msgstr ""
+"domeinnaam '%s' is niet bruikbaar als bestandsnaam: voorvoegsel wordt "
+"gebruikt"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directief 'domain %s' is genegeerd"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "leeg 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: waarschuwing: bronbestand bevat fuzzy vertaling"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s bestaat niet"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s bestaat maar kan deze niet lezen"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
 msgstr ""
 "optie '%c' kan niet gebruikt worden voordat\n"
 "'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, 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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2217,29 +2413,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2247,139 +2446,149 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Aangemaakt op %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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:401
+#: src/msginit.c:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "fout bij lezen van huidige map"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 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:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subproces %s is mislukt met afsluitwaarde %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Nederlandse vertalingen voor het pakket %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "huidige tekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "invoerbestand '%s' bevat geen kopregel met een tekensetspecificatie"
 
-#: src/msgl-cat.c:208
+#: 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 "domein '%s' in invoerbestand '%s' bevat geen kopregel met een tekensetspecificatie"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domein '%s' in invoerbestand '%s' bevat geen kopregel met een "
+"tekensetspecificatie"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "doeltekenset '%s' is geen overdraagbare codering"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, 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:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2388,7 +2597,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2397,12 +2606,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2410,7 +2619,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2419,7 +2628,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2430,80 +2639,84 @@ msgstr ""
 "coderingsnaam.  De uitvoer van '%s' zou onjuist kunnen zijn.\n"
 "Het zetten van LC_ALL=C kan dit eventueel vermijden.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ongeldige waarde van 'nplurals'"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ongeldige meervoudsexpressie"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "aantal meervouden = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "maar sommige berichten hebben slechts één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben slechts %lu meervoudsvormen"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "maar sommige berichten hebben één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben %lu meervoudsvormen"
 
-#: src/msgl-check.c:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgid_plural' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' beginnen niet beide met '\\n'"
@@ -2516,7 +2729,7 @@ msgstr "'msgid' en 'msgstr' beginnen niet beide met '\\n'"
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgid_plural' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' eindigen niet beide met '\\n'"
@@ -2529,83 +2742,94 @@ msgstr "'msgid' en 'msgstr' eindigen niet beide met '\\n'"
 msgid "plural handling is a GNU gettext extension"
 msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: invoer is ongeldig in codering '%s'"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: fout tijdens omzetten van codering '%s' naar '%s'"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:288
 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:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is alleen geldig met %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2629,54 +2853,56 @@ 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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  bestaande.po                bestaand bestand met oude vertalingen\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  referentie.pot              verwijzingen naar nieuwe programmatekst\n"
+msgstr ""
+"  referentie.pot              verwijzingen naar nieuwe programmatekst\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Locatie van uitvoerbestand in update-modus:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Het resultaat wordt teruggeschreven naar bestaande.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2684,131 +2910,149 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
 msgstr ""
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:615
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "dit bericht dient meervouden te definiëren"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "dit bericht dient geen meervouden te definiëren"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, %ld vervanderd, %ld ontbreken, %ld verouderd.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, "
+"%ld veranderd, %ld ontbreken, %ld verouderd.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " voltooid.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [BESTAND]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: 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:480
+#: 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:486
+#: 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:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2821,17 +3065,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:57 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 ""
@@ -2890,27 +3136,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "inconsistent gebruik van '#~'"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "ontbrekende 'msgstr[]'-sectie"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "ontbrekende 'msgid_plural'-sectie"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "ontbrekende 'msgstr'-sectie"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "eerste meervoudsvorm heeft een index ongelijk aan nul"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "meervoudsvorm heeft een onjuiste index"
@@ -2920,7 +3166,7 @@ msgstr "meervoudsvorm heeft een onjuiste index"
 msgid "too many errors, aborting"
 msgstr "te veel fouten -- gestopt"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ongeldige multibyte-sequentie"
@@ -2930,41 +3176,41 @@ msgstr "ongeldige multibyte-sequentie"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "onvolledige multibyte-sequentie aan einde van bestand"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "onvolledige multibyte-sequentie aan einde van regel"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv() is mislukt"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "sleutelwoord '%s' is onbekend"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ongeldige stuurtekenreeks"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "bestandseindeteken IN een tekenreeks"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "regeleindeteken IN een tekenreeks"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
@@ -2979,56 +3225,74 @@ msgstr "dit is de plek van de eerste definitie"
 
 #: src/read-desktop.c:267
 msgid "unterminated group name"
-msgstr ""
+msgstr "onafgemaakte groepsnaam"
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "waarschuwing: ongeldig Unicode-teken"
+msgstr "ongeldig niet-blanco teken"
 
-#: src/read-desktop.c:403
-#, fuzzy, c-format
+#: src/read-desktop.c:405
+#, c-format
 msgid "missing '=' after \"%s\""
-msgstr "ontbrekende filternaam"
+msgstr "ontbrekende '=' na \"%s\""
 
-#: src/read-desktop.c:466
-#, fuzzy
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
-msgstr "ongeldige waarde van 'nplurals'"
+msgstr "ongeldige niet-blanco regel"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "bestand '%s' is afgekapt"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten"
+msgstr ""
+"bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr ""
+"bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "bestand '%s' is geen GNU .mo-bestand"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten, op %s"
+msgstr ""
+"bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten, "
+"op %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "waarschuwing: ongeldige '\\uxxxx '-syntax voor Unicode-teken"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: waarschuwing: losse U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "waarschuwing: ongeldig Unicode-teken"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "waarschuwing: onafgesloten tekenreeks"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "waarschuwing: syntaxfout"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "waarschuwing: onafgesloten sleutel/waarde-paar"
 
@@ -3036,11 +3300,11 @@ msgstr "waarschuwing: onafgesloten sleutel/waarde-paar"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd ';' verwacht"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd '=' of ';' verwacht"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Geschreven door %s en %s.\n"
@@ -3049,155 +3313,167 @@ msgstr "Geschreven door %s en %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Hercodeert Servische tekst van Cyrillisch naar Latijns schrift.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fout tijdens omzetten van codering '%s' naar '%s'"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "er werden twee argumenten verwacht"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Gebruik:  %s [OPTIE] URL BESTAND\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fout bij lezen van '%s'"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "fout bij schrijven naar standaarduitvoer"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fout na lezen van '%s'"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Ophalen van %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " duurde te lang.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " is mislukt.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr ""
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr ""
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr ""
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan uitvoerbestand '%s' niet aanmaken"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standaarduitvoer"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kan map '%s' niet aanmaken"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fout bij openen van '%s' voor schrijven"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-po.c:822
-#, fuzzy
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
-msgstr "ongeldige multibyte-sequentie"
+msgstr "onvolledige multibyte-sequentie"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "geïnternationaliseerde berichten horen geen '\\%c'-stuurcodes te bevatten"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"geïnternationaliseerde berichten horen geen '\\%c'-stuurcodes te bevatten"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3206,7 +3482,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3223,7 +3499,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3235,250 +3512,278 @@ msgid ""
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "fout bij schrijven naar subproces %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: waarschuwing: onafgesloten reguliere expressie"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "waarschuwing: ongeldig Unicode-teken"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenconstante"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:270
+#: 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:286
+#: 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:298
+#: 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:307
+#: 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:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:339
+#: 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:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeksconstante"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: waarschuwing: ')' gevonden waar '}' werd verwacht"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: waarschuwing: '}' gevonden waar ')' werd verwacht"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "syntaxcontrole '%s' is onbekend"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "'--join-existing' kan niet gebruikt worden wanneer naar standaarduitvoer geschreven wordt"
+msgstr ""
+"'--join-existing' kan niet gebruikt worden wanneer naar standaarduitvoer "
+"geschreven wordt"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:938
 #, 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"
+msgstr ""
+"waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
+"aangenomen"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extraheert vertaalbare berichten uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1061
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3486,215 +3791,165 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:2340
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2344
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2349
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: waarschuwing: "
-
-#: src/xgettext.c:2458
-#, 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:2459
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr ""
-
-#: src/xgettext.c:2490
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-
-#: src/xgettext.c:2555
-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:3292
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3319
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3344
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3365
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr ""
-
-#: src/xgettext.c:3740
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3702,101 +3957,96 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "taal '%s' is onbekend"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: waarschuwing: losse U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, 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-javascript.c:313
+#: src/x-javascript.c:312
 #, 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-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, fuzzy, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: waarschuwing: %s is niet toegestaan"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: waarschuwing: onafgesloten XML-opmaak"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: kan tekenreeksafsluiter '%s' niet vinden"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: ontbrekend rechterhaakje in \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
@@ -3804,7 +4054,7 @@ msgstr ""
 #: src/x-python.c:279
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 #: src/x-python.c:325
@@ -3812,7 +4062,7 @@ msgstr ""
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 #: src/x-python.c:342
@@ -3820,7 +4070,7 @@ msgstr ""
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 #: src/x-python.c:355
@@ -3828,7 +4078,7 @@ msgstr ""
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 #: src/x-python.c:365
@@ -3836,7 +4086,7 @@ msgstr ""
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 #: src/x-python.c:398
@@ -3844,35 +4094,54 @@ msgstr ""
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Onbekende codering '%s'.  Verdergegaan met ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ongeldige definitie van tekenreeks"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: ontbrekend getal na #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ongeldige tekenreeksexpressie"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ongeldige definitie van tekenreeks"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ongeldige definitie van tekenreeks"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#: src/x-vala.c:616
 #, fuzzy, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
@@ -4003,6 +4272,38 @@ msgstr "binnen een commentaar of bewerkingsinstructie"
 msgid "document ended unexpectedly: %s"
 msgstr "document eindigde onverwacht: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: optie '--%s' staat geen argument toe\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: onbekende optie '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: optie '-W %s' is niet eenduidig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: optie '-W %s' staat geen argument toe\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: optie '-W %s' vereist een argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "waarschuwing: oudere versies van 'msgfmt' vinden dit een fout\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: waarschuwing: "
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ongeldige optie -- %c\n"
 
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index ffab0b2e5..ff0746d4a 100644
--- 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: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -16,40 +16,40 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "Ugyldig argument %s for %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "Fleirtydig argument %s for %s"
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Gyldige argument er:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:325
 #, 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:339
 #, 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:435
 #, 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:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
@@ -58,347 +58,598 @@ msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
 msgid "write error"
 msgstr "Skrivefeil"
 
-#: 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-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "Feil ved opning av fila «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:73
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
 msgstr "Klarer ikkje opna reservekopien «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "Feil ved lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "Feil ved skriving til «%s»"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%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:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "«fdopen()» mislukkast"
 
-#: gnulib-lib/csharpcomp.c:570
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Fann ikkje C#-kompilatoren. Prøv å installera «pnet»."
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Fann ikkje virtuell maskin for C#. Prøv å installera «pnet»."
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Ukjend 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:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Underprosessen %s var mislukka"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: Flagget «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Flagget «--%s» tek ikkje argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Flagget «%s» er fleirtydig\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:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: Flagget «%c%s» er ukjent\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: Flagget «%c%s» tek ikkje 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:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: Flagget «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: Flagget «--%s» er ukjent\n"
-
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: Flagget «%c%s» er ukjent\n"
-
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: Flagget «-- %c» er ulovleg\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:621
 #, 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: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:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Flagget treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Flagget «-W %s» er fleirtydig\n"
-
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Flagget «-W %s» tek ikkje argument\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 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:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Klarte ikkje oppretta «%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
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Feil under skriving av fila «%s»"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Fann ikkje Java-kompilatoren. Prøv å installera «gcj» eller vel «$JAVAC»."
+msgstr ""
+"Fann ikkje Java-kompilatoren. Prøv å installera «gcj» eller vel "
+"«$JAVAC»."
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Fann ikkje virtuell maskin for Java. Prøv å installera «gij» eller vel «$JAVA»."
+msgstr ""
+"Fann ikkje virtuell maskin for Java. Prøv å installera «gij» eller vel "
+"«$JAVA»."
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Inn/ut-feil i underprosessen %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/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
-msgid "cannot create pipe"
-msgstr "Klarer ikkje oppretta røyr"
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "'"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "Klarer ikkje oppretta røyr"
 
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "«_open_osfhandle» mislukkast"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikkje opprette utfila \"%s\""
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s-underprosess"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Underprosessen %s fekk det alvorlege signalet %d"
 
-#: src/format.c:143
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
-msgstr "«%s» er ikkje ein gyldig streng i %s-formatet, til skilnad frå «msgif». Årsak: %s"
+msgid "Could not parse file %s as XML"
+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/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Prøv «%s --help» for meir informasjon.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION]\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Bruk: %s [VAL]\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr ""
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr ""
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"© %s Free Software Foundation, Inc.\n"
+"Lisens: GPLv3+ (GNU GPL versjon 3 eller seinare, <http://gnu.org/licenses/gpl.html>)\n"
+"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/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrive av %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "Ein formatspesifikasjon for argumentet %u, som i «%s», finst ikkje i «msgid»"
+msgid "error while opening \"%s\" for reading"
+msgstr "Feil ved opning av fila «%s» for lesing"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"Ein formatspesifikasjon for argumentet %u, som i «%s», finst ikkje 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-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "Ein formatspesifikasjon for argumentet %u finst ikkje 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"
-msgstr "Formatspesifikasjonane i «msgid» og «%s» for argumentet %u er ikkje like"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 ""
+"Formatspesifikasjonane i «msgid» og «%s» for argumentet %u er ikkje like"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktivnummeret %u startar, men sluttar ikkje, med |."
 
-#: src/format-c.c:181
+#: src/format.c:152
+#, 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 ikkje ein gyldig streng i %s-formatet, til skilnad frå «msgif». "
+"Årsak: %s"
+
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "I direktivnummer %u er symbolet etter «<» ikkje namnet på ein formatspesifikasjonsmakro. Gyldige makronamn kan ein finne i ISO C 99, avsnitt 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"I direktivnummer %u er symbolet etter «<» ikkje namnet på ein "
+"formatspesifikasjonsmakro. Gyldige makronamn kan ein finne i ISO C 99, "
+"avsnitt 7.8.1."
 
-#: src/format-c.c:588
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "I direktivnummer %u er symbolet etter «<» ikkje etterfølgt av «>»."
+msgstr ""
+"I direktivnummer %u er symbolet etter «<» ikkje etterfølgt av «>»."
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Strengen viser til argumentnummer %u, men tek ikkje omsyn til argumentnummer %u."
+msgstr ""
+"Strengen viser til argumentnummer %u, men tek ikkje omsyn til argumentnummer "
+"%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"
-msgstr "Talet på formatspesifikasjonar i «msgid» og «%s» er ikkje det same"
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, 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 ""
+"Talet på formatspesifikasjonar i «msgid» og «%s» er ikkje det same"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "I direktivnummer %u er ikkje «{» etterfølgt av eit argumentnummer."
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "I direktivnummer %u er ikkje «,» etterfølgt av eit tal."
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Strengen sluttar midt i eit direktiv. «{» vart funnen utan tilhøyrande «}»."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Strengen sluttar midt i eit direktiv. «{» vart funnen utan tilhøyrande «}"
+"»."
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Direktivnummer %u sluttar med det ugyldige teiknet «%c», i staden for «}»."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Direktivnummer %u sluttar med det ugyldige teiknet «%c», i staden for «}"
+"»."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Direktivnummer %u sluttar med eit ugyldig teikn i staden for «}»."
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Strengen byrjar midt i eit direktiv. «}» vart funnen utan tilhøyrande «{»."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Strengen byrjar midt i eit direktiv. «}» vart funnen utan tilhøyrande "
+"«{»."
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Strengen inneheld ein enkelt «}» etter direktivnummer %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 "Flaggkombinasjonen i direktivnummer %u er ugyldig."
 
-#: 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 direktivnummer %u er det ikkje lov med ei presisering før «%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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "Argumentnummeret for presiseringa må vera lik %u i direktivnummer %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 "I direktivnummer %u er det ikkje lov med ein presiseringsspesifikasjon før «%c»."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"I direktivnummer %u er det ikkje lov med ein presiseringsspesifikasjon før "
+"«%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 "Presiseringsspesifikasjonen i direktivnummer %u er ugyldig."
 
-#: 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 direktivnummer %u er det ikkje lov med flagg før «%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 "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
 
-#: 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 "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
+
+#: src/format-gfc-internal.c:383
+#, fuzzy, c-format
+#| msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
+
+#: src/format-gfc-internal.c:386
+#, fuzzy, c-format
+#| msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%C but '%s' uses %%C"
 msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
 
 #: src/format-invalid.h:22
@@ -406,33 +657,53 @@ msgid "The string ends in the middle of a directive."
 msgstr "Strengen sluttar midt i eit direktiv."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Strengen viser til argument både gjennom absolutte argumentnummer og unummererte argumentspesifikasjonar."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Strengen viser til argument både gjennom absolutte argumentnummer og "
+"unummererte argumentspesifikasjonar."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "Argumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Breiddeargumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Breiddeargumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Presisjonsargumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Presisjonsargumentnummeret 0 i direktivnummer %u er ikkje eit positivt "
+"heiltal."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "I direktivnummer %u er ikkje teiknet «%c» ein gyldig omgjeringsspesifikasjon."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"I direktivnummer %u er ikkje teiknet «%c» ein gyldig "
+"omgjeringsspesifikasjon."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Teiknet som avsluttar direktivnummer %u er ikkje ein gyldig omgjeringsspesifikasjon."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Teiknet som avsluttar direktivnummer %u er ikkje ein gyldig "
+"omgjeringsspesifikasjon."
 
 #: src/format-invalid.h:40
 #, c-format
@@ -441,8 +712,12 @@ msgstr "Strengen viser til argumentnummer %u på måtar som ikkje er gyldige."
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "I direktivnummer %u har ikkje delstrengen «%s» eit gyldig format for dato og klokkeslett."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"I direktivnummer %u har ikkje delstrengen «%s» eit gyldig format for dato "
+"og klokkeslett."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -451,13 +726,18 @@ msgstr "I direktivnummer %u er ikkje «%s» etterfølgt av eit komma."
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "I direktivnummer %u har ikkje delstrengen «%s» eit gyldig talformat."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Argumentnummeret i direktivnummer %u er ikkje etterfølgt av eit komma og anten «%s», «%s», «%s» eller «%s»."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Argumentnummeret i direktivnummer %u er ikkje etterfølgt av eit komma og "
+"anten «%s», «%s», «%s» eller «%s»."
 
 #: src/format-java.c:572
 #, c-format
@@ -466,129 +746,243 @@ msgstr "Valet i direktivnummer %u har ikkje noko nummer."
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Valet i direktivnummer %u har eit nummer som ikkje er etterfølgt av «<», «#» eller «%s»."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Valet i direktivnummer %u har eit nummer som ikkje er etterfølgt av «<», "
+"«#» eller «%s»."
 
 #: src/format-java.c:745
-#, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
-msgstr "Ein formatspesifikasjon for argument {%u}, som i «%s», finst ikkje i «msgid»"
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"Ein formatspesifikasjon for argument {%u}, som i «%s», finst ikkje 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 "Ein formatspesifikasjon for argument {%u} finst ikkje i «%s»"
 
-#: src/format-java.c:775
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-msgstr "Formatspesifikasjonane i «msgid» og «%s» for argumentet {%u} er ikkje like"
+#: src/format-java.c:776
+#, 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 ""
+"Formatspesifikasjonane i «msgid» og «%s» for argumentet {%u} er ikkje "
+"like"
+
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Strengen viser til argumentnummer %u, men tek ikkje omsyn til argumentnummer "
+"%u."
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"Ein formatspesifikasjon for argumentet %u, som i «%s», finst ikkje i "
+"«msgid»"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+msgid "error while parsing: %s"
+msgstr "feil under skriving av fila \"%s\""
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Parameteren «%u» i direktivnummer %u er av typen «%s», men det var venta ein parameter av typen «%s»."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Parameteren «%u» i direktivnummer %u er av typen «%s», men det var venta "
+"ein parameter av typen «%s»."
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det meste venta %u parameter."
-msgstr[1] "Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det meste venta %u parametrar."
+msgid ""
+"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."
+msgstr[0] ""
+"Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det "
+"meste venta %u parameter."
+msgstr[1] ""
+"Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det "
+"meste venta %u parametrar."
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "I direktivnummer %u er argumentet «%d» negativt."
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Strengen sluttar midt i eit «~/.../»-direktiv."
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Fann «~%c» utan passande «~%c»."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "Det er oppgjeve valtastar for både «@» og «:» i direktivnummer %u."
+msgstr ""
+"Det er oppgjeve valtastar for både «@» og «:» i direktivnummer %u."
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "«~:[» i direktivnummer %u er ikkje etterfølgt av to paragrafteikn skilde av «~;»."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"«~:[» i direktivnummer %u er ikkje etterfølgt av to paragrafteikn skilde "
+"av «~;»."
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "«~;» har ei ugyldig plassering i direktivnummer %u."
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Strengen viser til nokre av argumenta på måtar som ikkje er gyldige."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, fuzzy, c-format
+#| msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "Formatspesifikasjonane i «msgid» og «%s» er ikkje like"
 
-#: 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'"
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, 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 "Formatspesifikasjonane i «%s» er ikkje ein del av dei i «msgid»"
 
-#: src/format-perl.c:433
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Storleiksspesifikasjonen i direktivnummer %u er ikkje gyldig med omgjeringsspesifikasjonen «%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-brace.c:442
+#: src/format-python-brace.c:455 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 "Ein formatspesifikasjon for argument «%s» finst ikkje i «%s»"
 
-#: src/format-python.c:112
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Strengen viser til argument både gjennom argumentnamn og gjennom namnlause argumentspesifikasjonar."
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Storleiksspesifikasjonen i direktivnummer %u er ikkje gyldig med "
+"omgjeringsspesifikasjonen «%c»."
+
+#: src/format-python-brace.c:138
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
+
+#: src/format-python-brace.c:157
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "I direktivnummer %u er ikkje «{» etterfølgt av eit argumentnummer."
+
+#: src/format-python-brace.c:171
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
+
+#: src/format-python-brace.c:193
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "I direktivnummer %u er det ikkje lov med ei presisering før «%c»."
+
+#: src/format-python-brace.c:278
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "I direktivnummer %u er argumentet «%d» negativt."
+
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Strengen viser til argument både gjennom argumentnamn og gjennom namnlause "
+"argumentspesifikasjonar."
 
-#: 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"
-msgstr "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
+"overeins"
 
-#: src/format-python.c:426
-#, c-format
-msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+#: src/format-python.c:437
+#, fuzzy, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
+"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
+"overeins"
 
-#: 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'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u 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"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u 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"
+msgid ""
+"'%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
@@ -596,11 +990,15 @@ msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
 msgstr ""
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr ""
 
 #: src/format-sh.c:85
@@ -609,440 +1007,487 @@ msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 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
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
-"© %s Free Software Foundation, Inc.\n"
-"Lisens: GPLv3+ (GNU GPL versjon 3 eller seinare, <http://gnu.org/licenses/gpl.html>)\n"
-"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: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
-#, 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: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:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argument"
 
-#: 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
-#, 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:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Bruk: %s [VAL]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 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:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, 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
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
 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
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "Klarer ikkje oppretta røyr"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:695
 #, c-format
-msgid "could not get host name"
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "Ugyldig argument %s for %s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "Klarer ikkje oppretta røyr"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "kan ikkje opprette utfila \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
 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:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, 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:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, 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:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:426
 #, 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:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+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:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, 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:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, 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:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+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:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, 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:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:478
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+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:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, 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:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+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:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+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:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, 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:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\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:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
+#, 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:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+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:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+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:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+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:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, 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:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:1023
 #, 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"
@@ -1051,108 +1496,102 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\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:1039
 #, 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:1041
 #, 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:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+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:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, 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:337 src/msguniq.c:378
 #, 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:380
 #, 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:345 src/msgmerge.c:628
 #, 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:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:217
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1174,79 +1613,86 @@ msgstr ""
 "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, vert\n"
 "«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
+#, c-format
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:246
 #, 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 meldinga er ikkje 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:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, fuzzy, c-format
 msgid "found %d fatal error"
 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"
@@ -1254,77 +1700,79 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "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:1186
 #, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:339
 #, 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:363 src/msgen.c:359 src/msgmerge.c:642
 #, 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:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, 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:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --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:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, 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:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:233
+#: src/msgen.c:263
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:274
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1333,22 +1781,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr ""
 
-#: src/msgexec.c:240
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1358,444 +1806,570 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:276
 #, 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
 #, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgid "Command input:\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:283
 #, c-format
-msgid "write to stdout failed"
+msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
-msgid "write to %s subprocess failed"
+msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgexec.c:355
+#, c-format
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgfilter.c:304
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:441
 #, 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
-#, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
-
-#: src/msgfilter.c:430
+#: src/msgfilter.c:446
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid "Filter input and output:\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
-"                                to be executed\n"
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:452
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-
-#: src/msgfilter.c:447 src/msggrep.c:577
-#, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:454
 #, c-format
-msgid "      --indent                indented output style\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:456
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
+"                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:587
+#: src/msgfilter.c:459
 #, c-format
-msgid "Not yet implemented."
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:616
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:644
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
-msgid "communication with %s subprocess failed"
+msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:695
+#: src/msgfilter.c:485
 #, c-format
-msgid "read from %s subprocess failed"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/msgfmt.c:302
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:419
 #, 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:450 src/msgunfmt.c:268 src/xgettext.c:673
 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:471
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:571 src/msgfmt.c:599
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr ""
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr ""
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s og %s utelukker kvarandre"
+
+#: src/msgfmt.c:626 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:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "kan ikkje opprette utfila \"%s\""
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
-#, 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:922
 #, 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:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr ""
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:957
 #, 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:959 src/msgfmt.c:975 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:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+
+#: src/msgfmt.c:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:981
 #, 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:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:991
 #, 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:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1045
 #, 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:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1072
 #, 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:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:882
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr ""
-
-#: src/msgfmt.c:884
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:1230
 #, c-format
-msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1290
 #, c-format
-msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1291
 #, c-format
-msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1339
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: 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/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
+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:521
 #, 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:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1835,29 +2409,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1865,139 +2442,147 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:371
 #, 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:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:391
 #, 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:404
 #, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:472
 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:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:493
 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:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 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:1621
 #, 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:178 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:258
 #, 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"
+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"
+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:392 src/msgl-iconv.c:366
 #, 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:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:444
 #, 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:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2006,7 +2591,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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2015,12 +2600,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2028,7 +2613,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2037,7 +2622,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2045,180 +2630,201 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:145
 #, 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:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:270
 #, 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:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:478
 #, 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:494
 #, 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
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+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:616
 #, fuzzy
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:623
 #, fuzzy, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:639
 #, fuzzy
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:657
 #, fuzzy
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:664
 #, fuzzy, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:680
 #, fuzzy
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:818
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "filhovud-feltet «%s» manglar i filhovud"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:835
 #, fuzzy, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
+msgid "header field '%s' missing in header\n"
+msgstr "filhovud-feltet «%s» manglar i filhovud"
 
-#: src/msgl-check.c:717
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
-msgstr "nokre filhovud-felt har framleis sin initielle verdi"
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:730
-#, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "feltet «%s» har framleis sin forvalgte verdi"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+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 "feil under skriving av fila \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:288
 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:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+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:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+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:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+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:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:545
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2243,54 +2849,55 @@ msgstr ""
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:568
 #, 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:574
 #, 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:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2298,136 +2905,149 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:610
 #, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
 msgstr ""
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1685
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1706
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2110
 #, fuzzy, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, 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"
+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"
+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"
+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 name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "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:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2440,17 +3060,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+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 ""
@@ -2462,157 +3084,189 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:241
 #, fuzzy, c-format
-msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:250
 #, fuzzy, c-format
-msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:257
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 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
 #, fuzzy, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: 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:505 src/write-po.c:812 src/write-po.c:949
 #, 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:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:488
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:982
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:988
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:372
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "den første definisjonen finst her"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+msgid "missing '=' after \"%s\""
+msgstr "manglar argument"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr ""
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" er avkutta"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr ""
 
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr ""
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr ""
@@ -2625,7 +3279,7 @@ msgstr ""
 msgid "warning: unterminated key/value pair"
 msgstr ""
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 
@@ -2633,7 +3287,7 @@ msgstr ""
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr ""
@@ -2642,124 +3296,169 @@ msgstr ""
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:363
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:158
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "manglar argument"
 
-#: src/urlget.c:163
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:180
 #, 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:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "Feil ved lesing av «%s»"
+
+#: src/urlget.c:233
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "Feil etter lesing av «%s»"
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
 msgstr ""
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:708
 #, 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:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, fuzzy, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "feil under skriving av fila \"%s\""
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, fuzzy, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "feil under skriving av fila \"%s\""
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr ""
 
-#: src/write-po.c:766
-#, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2768,7 +3467,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2777,548 +3476,814 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:133
 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:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "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:340 src/x-javascript.c:748 src/x-python.c:866
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, 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:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr ""
+
+#: src/x-c.c:1344
+#, c-format
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr ""
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1218
+#: src/x-c.c:1654 src/x-vala.c:907
 #, 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:225
+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-javascript.c:321 src/x-python.c:375
 #, 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
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, 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:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
+
+#: src/xgettext.c:637
+#, c-format
+msgid "syntax check '%s' unknown"
+msgstr ""
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr ""
+
+#: src/xgettext.c:701
+#, 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:705
 #, c-format
-msgid "%s:%lu:%lu: %s"
+msgid "xgettext cannot work without keywords to look for"
+msgstr ""
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/x-perl.c:307
+#: src/xgettext.c:1027
 #, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/xgettext.c:1050
 #, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/xgettext.c:1052
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/xgettext.c:1054
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/xgettext.c:1059
 #, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: ulovleg flagg -- %c\n"
+msgid "Choice of input file language:\n"
+msgstr "inga innfil spesifisert"
 
-#: src/x-perl.c:1225
+#: src/xgettext.c:1061
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/xgettext.c:1068
 #, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/x-python.c:233
+#: src/xgettext.c:1070
 #, c-format
 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"
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/xgettext.c:1078
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr ""
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr ""
+
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\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/x-python.c:321
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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"
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/xgettext.c:1101
 #, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgid "Language specific options:\n"
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/xgettext.c:1103
 #, c-format
-msgid "%s:%d: invalid string definition"
+msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/xgettext.c:1105
 #, c-format
-msgid "%s:%d: missing number after #"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/xgettext.c:1113
 #, c-format
-msgid "%s:%d: invalid string expression"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/x-sh.c:1075
+#: src/xgettext.c:1121
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:1126
 #, 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"
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
 
-#: src/xgettext.c:572
+#: src/xgettext.c:1128
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
+msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:1130
 #, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr ""
 
-#: src/xgettext.c:766
+#: src/xgettext.c:1132
 #, c-format
-msgid "Extract translatable strings from given input files.\n"
+msgid "                                (only XML based languages)\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:1134
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
+msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:1138
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:798
-#, fuzzy, c-format
-msgid "Choice of input file language:\n"
-msgstr "inga innfil spesifisert"
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:1146
 #, c-format
 msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:1171
 #, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:1175
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:1188
 #, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:1190
 #, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:1192
 #, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
+msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:1194
 #, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:1198
 #, c-format
-msgid "Language specific options:\n"
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1201
 #, c-format
-msgid "  -a, --extract-all           extract all strings\n"
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:1597
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr ""
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr ""
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/x-javascript.c:312
 #, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/x-javascript.c:344
 #, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "      --qt                    recognize Qt format strings\n"
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/x-perl.c:1074
 #, c-format
-msgid "                                (only language C++)\n"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/x-perl.c:1195
 #, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/x-perl.c:1215
 #, c-format
-msgid "      --boost                 recognize Boost format strings\n"
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/x-perl.c:1249
+#, fuzzy, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s: ulovleg flagg -- %c\n"
+
+#: src/x-perl.c:1262
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/x-perl.c:1279
 #, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/x-python.c:279
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:325
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/x-python.c:342
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/x-python.c:355
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/x-python.c:365
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/x-python.c:398
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/x-python.c:654
 #, c-format
-msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/x-rst.c:116
 #, c-format
-msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
+msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/x-rst.c:180
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/xgettext.c:1785
-msgid "standard input"
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/x-rst.c:676
 #, c-format
-msgid "%s%s: warning: "
+msgid "%s:%d: invalid JSON syntax"
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/x-rst.c:683
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: invalid RSJ syntax"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/x-rst.c:691
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/x-sh.c:1101
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:2058
-msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+#: src/x-vala.c:616
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
 msgstr ""
 
-#: src/xgettext.c:2664
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: libgettextpo/markup.c:377
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
+msgid "'%s' is not a valid name: %c"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: libgettextpo/markup.c:397
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid "'%s' is not a valid name: '%c'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid "invalid character reference: %s"
 msgstr ""
 
-#: src/xgettext.c:2828
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid entity reference: %s"
+msgstr "Ugyldig argument %s for %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "Ugyldig argument %s for %s"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid "language `%s' unknown"
+msgid "missing '%c'"
 msgstr ""
 
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+msgid "inside an attribute name"
+msgstr "manglar argument"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
 msgstr ""
 
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Flagget «--%s» tek ikkje argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: Flagget «--%s» er ukjent\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: Flagget «-- %c» er ulovleg\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: Flagget «-W %s» er fleirtydig\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Flagget «-W %s» tek ikkje argument\n"
+
+#, c-format
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
+
+#, fuzzy, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
+
+#, fuzzy, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet «%s» har framleis sin forvalgte verdi"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -3333,31 +4298,40 @@ msgstr ""
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=TEXTDOMAIN   hent oversette meldingar frå TEXTDOMAIN\n"
-#~ "  -e                        slå på ekspandering av nokre escape-sekvensar\n"
+#~ "  -e                        slå på ekspandering av nokre escape-"
+#~ "sekvensar\n"
 #~ "  -E                        (tillete av kompatibilitetsomsyn)\n"
 #~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
 #~ "  -n                        undertrykk etterfølgjande linjeskift\n"
 #~ "  -v, --version             vis programversjon og avslutt\n"
-#~ "  [TEXTDOMAIN] MSGID        hent oversett melding som stemmer overeins med\n"
+#~ "  [TEXTDOMAIN] MSGID        hent oversett melding som stemmer overeins "
+#~ "med\n"
 #~ "                            MSGID frå TEXTDOMAIN\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Dersom TEXTDOMAIN-parameteren ikkje er gjeven, vert domenet valgt frå\n"
 #~ "miljøvariabelen TEXTDOMAIN.  Dersom meldingskatalogen ikkje finst i den\n"
-#~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp av\n"
+#~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp "
+#~ "av\n"
 #~ "miljøvariabelen TEXTDOMAIN.\n"
-#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen «echo»,\n"
+#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen "
+#~ "«echo»,\n"
 #~ "men gjer ikkje ein enkel kopiering av argumenta sine til standard ut.  I\n"
 #~ "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 #~ "Standard søkekatalog er: %s\n"
@@ -3372,17 +4346,22 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ "  -h, --help                     display this help and exit\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -a, --extract-all             ekstrahér alle strengar\n"
 #~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
 #~ "                                kommentarar i linjer som kjem foran\n"
@@ -3391,8 +4370,10 @@ msgstr ""
 #~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
 #~ "                                messages.po)\n"
 #~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
-#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
 #~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
 
@@ -3400,18 +4381,25 @@ msgstr ""
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
@@ -3427,12 +4415,16 @@ 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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -3445,8 +4437,10 @@ msgstr ""
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] filnavn.po ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
-#~ "  -a, --alignment=ANTALL    justér strengar til ANTALL bytes (forvalgt: %d)\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -a, --alignment=ANTALL    justér strengar til ANTALL bytes (forvalgt: "
+#~ "%d)\n"
 #~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
 #~ "      --no-hash             binærfil skal ikkje innehalde hash-tabell\n"
 #~ "  -o, --output-file=FILNAVN sett utfil til FILNAVN\n"
@@ -3454,7 +4448,8 @@ msgstr ""
 #~ "  -v, --verbose             list alle avvik i innfil\n"
 #~ "  -V, --version             vis programversjon og avslutt\n"
 #~ "\n"
-#~ "Dersom innfil er -, vil inndata verte lest frå standard inn.  Dersom utfil\n"
+#~ "Dersom innfil er -, vil inndata verte lest frå standard inn.  Dersom "
+#~ "utfil\n"
 #~ "er -, vil utdata verte skrive til standard ut.\n"
 
 #~ msgid "while creating hash table"
@@ -3464,7 +4459,8 @@ msgstr ""
 #~ msgid ""
 #~ "Usage: %s [OPTION] def.po ref.po\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "  -e, --no-escape             do not use C escapes in output (default)\n"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
@@ -3472,16 +4468,19 @@ msgstr ""
 #~ "  -i, --indent                indented output style\n"
 #~ "  -o, --output-file=FILE      result will be written to FILE\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ "  -V, --version               output version information and exit\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
 #~ "  -i, --indent             indentert utdata\n"
 #~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
@@ -3497,7 +4496,8 @@ msgstr ""
 #~ "      --force-po           write PO file even if empty\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 #~ "  -w, --width=NUMBER       set output page width\n"
@@ -3508,7 +4508,8 @@ msgstr ""
 #~ "  -E, --escape             use C escapes in output, no extended chars\n"
 #~ "  -h, --help               display this help and exit\n"
 #~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard output\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
 #~ "      --strict             write strict uniforum style\n"
 #~ "  -V, --version            output version information and exit\n"
 
@@ -3521,8 +4522,10 @@ msgstr ""
 #~ "By default the output is written to standard output.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Konverter binære .mo-filer til Uniforum .po-filer.  Både «little-endian» og\n"
-#~ "«big-endian» .mo filer vert håndtert.  Dersom innfil er -, blir standard\n"
+#~ "Konverter binære .mo-filer til Uniforum .po-filer.  Både «little-"
+#~ "endian» og\n"
+#~ "«big-endian» .mo filer vert håndtert.  Dersom innfil er -, blir "
+#~ "standard\n"
 #~ "inn lest.  Dersom utfil er -, vert det skrive til standard ut.\n"
 
 #~ msgid "seek \"%s\" offset %ld failed"
@@ -3538,18 +4541,25 @@ msgstr ""
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
 #~ "  -a, --extract-all             ekstrahér alle strengar\n"
 #~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
 #~ "                                kommentarar i linjer som kjem foran\n"
@@ -3558,8 +4568,10 @@ msgstr ""
 #~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
 #~ "                                messages.po)\n"
 #~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
-#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida teikn\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
 #~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
 #~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
 
@@ -3568,20 +4580,29 @@ msgstr ""
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
+#~ "instead %u\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                    vis denne hjelpeteksta og avslutt\n"
 #~ "  -i, --indent                  lag indentert utdata\n"
-#~ "  -j, --join-existing           flett saman meldingar med eksisterande fil\n"
-#~ "  -k, --keyword[=ORD]           sjå også etter nøkkelordet ORD (manglar ORD,\n"
-#~ "                                skal ikkje dei vanlege nøkkelorda nyttast)\n"
+#~ "  -j, --join-existing           flett saman meldingar med eksisterande "
+#~ "fil\n"
+#~ "  -k, --keyword[=ORD]           sjå også etter nøkkelordet ORD "
+#~ "(manglar ORD,\n"
+#~ "                                skal ikkje dei vanlege nøkkelorda "
+#~ "nyttast)\n"
 #~ "  -l, --string-limit=NUMMER     sett største streng-lengde til NUMMER\n"
 #~ "                                i staden for %u\n"
 #~ "  -m, --msgstr-prefix[=STRENG]  bruk STRENG eller \"\" som prefiks for\n"
@@ -3592,12 +4613,17 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -3605,8 +4631,10 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
diff --git a/gettext-tools/po/pa.po b/gettext-tools/po/pa.po
index cf8b5eb5c..3d44377f4 100644
--- a/gettext-tools/po/pa.po
+++ b/gettext-tools/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2010-05-09 13:18+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2012-05-21 20:08+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sourceforge.net>\n"
@@ -15,40 +15,40 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ %1$s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:153
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "ਠੀਕ ਆਰਗੂਮੈਂਟ ਹਨ:"
 
-#: gnulib-lib/clean-temp.c:335
+#: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕਦੀ, $TMPDIR ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: gnulib-lib/clean-temp.c:349
+#: gnulib-lib/clean-temp.c:339
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ਟੈਪਲੇਟ \"%s\" ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/clean-temp.c:445
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ਆਰਜ਼ੀ ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/clean-temp.c:460
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -57,145 +57,138 @@ msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ
 msgid "write error"
 msgstr "ਲਿਖਣ ਗਲਤੀ"
 
-#: 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
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:74
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
 msgstr "ਲਿਖਣ ਲਈ ਬੈਕਅੱਪ ਫਾਇਲ \"%s\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
-#: gnulib-lib/copy-file.c:133
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "\"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
 
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() ਫੇਲ੍ਹ ਹੈ"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C# ਕੰਪਾਇਲਰ ਨਹੀਂ ਲੱਭਿਆ, pnet ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
+msgstr "C# ਕੰਪਾਇਲਰ ਨਹੀਂ ਲੱਭਿਆ, pnet ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
 
-#: gnulib-lib/error.c:181
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "ਅਣਜਾਣ ਸਿਸਟਮ ਗਲਤੀ"
 
-#: 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
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, 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"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%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"
-msgstr "%s: ਚੋਣ '--%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+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"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ਅਣਜਾਣ ਚੋਣ '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: ਚੋਣ '%c%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%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"
-msgstr "%s: ਅਣਜਾਣ ਚੋਣ '--%s'\n"
-
-#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ਅਣਜਾਣ ਚੋਣ '%c%s'\n"
-
-#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ਗਲਤ ਚੋਣ -- '%c'\n"
 
-#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
-#: gnulib-lib/getopt.c:1053
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ --'%c'\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: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
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr ""
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, 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:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ਫਾਇਲ \"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -205,98 +198,297 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ I/O ਗਲਤੀ"
 
-#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: 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
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ"
 
-#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
-msgid "cannot create pipe"
-msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, fuzzy, c-format
+#| msgid "write to %s subprocess failed"
+msgid "read from %s subprocess failed"
+msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, fuzzy, c-format
+#| msgid "write to %s subprocess failed"
+msgid "communication with %s subprocess failed"
+msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
-#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:272
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:273
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:40
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ਫੇਲ੍ਹ ਹੈ"
 
-#: gnulib-lib/w32spawn.h:81
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d ਰੀਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: dup2 ਫੇਲ੍ਹ ਹੈ"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:148
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "ਵਰਤੋਂ: %s [OPTION] [FILE]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               ਆਉਟਪੁੱਟ ਵਰਜਨ ਜਾਣਕਾਰੀ ਅਤੇ ਬੰਦ ਕਰੋ\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> ਨੂੰ ਭੇਜੋ।\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc।\n"
+"License GPLv3+: GNU GPL version 3 ਜਾਂ ਨਵਾਂ <http://gnu.org/licenses/gpl.html>\n"
+"ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
+"ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "%s ਵਲੋਂ ਲਿਖਿਆ।\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
 msgstr ""
 
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+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:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 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:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: 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
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -306,55 +498,67 @@ msgstr ""
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:181
+#: src/format.c:152
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
-#: src/format-c.c:588
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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:515
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr ""
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
@@ -371,12 +575,16 @@ msgstr ""
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr ""
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr ""
 
 #: src/format-gcc-internal.c:406
@@ -399,37 +607,60 @@ msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
+#: src/format-gfc-internal.c:383
+#, fuzzy, c-format
+#| msgid "'%s' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
+
+#: src/format-gfc-internal.c:386
+#, fuzzy, c-format
+#| msgid "'%s' uses %%m but '%s' doesn't"
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
+
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr ""
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr ""
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr ""
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr ""
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr ""
 
 #: src/format-invalid.h:40
@@ -439,7 +670,9 @@ msgstr ""
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr ""
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
@@ -449,12 +682,15 @@ msgstr ""
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
 #: src/format-java.c:572
@@ -464,12 +700,15 @@ msgstr ""
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
 msgstr ""
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-java.c:756
@@ -479,84 +718,144 @@ msgstr ""
 
 #: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' 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-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+
+#: src/format-kde.c:242
+#, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
 msgstr ""
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
+msgid ""
+"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."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%c' ਮਿਲਿਆ '~%c' ਮਿਲਣ ਦੇ ਬਿਨਾਂ।"
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+
+#: src/format-python-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-python-brace.c:157
 #, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
 msgstr ""
 
 #: src/format-python.c:354
@@ -566,27 +865,33 @@ msgstr ""
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
 #: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
+msgid ""
+"'%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
@@ -594,11 +899,15 @@ msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
 msgstr ""
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr ""
 
 #: src/format-sh.c:85
@@ -607,442 +916,474 @@ msgstr ""
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr ""
-
-#: 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"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc।\n"
-"License GPLv3+: GNU GPL version 3 ਜਾਂ ਨਵਾਂ <http://gnu.org/licenses/gpl.html>\n"
-"ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
-"ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
-
-#: 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: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
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "ਬਰੁਨੋ ਹਏਬਲੇ"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "ਬਹੁਤ ਸਾਰੇ ਆਰਗੂਮੈਂਟ"
 
-#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "ਮਸ਼ੀਨ ਦਾ ਹੋਸਟ ਨਾਂ ਪ੍ਰਿੰਟ ਕਰੋ।\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ:\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 ਛੋਟਾ ਹੋਸਟ ਨਾਂ\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ਹੋਸਟ-ਨਾਂ ਲਈ ਐਡਰੈਸ\n"
 
-#: 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
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਆਉਟਪੁੱਟ:\n"
 
-#: 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "ਹੋਸਟ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: 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"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "ਘੱਟੋ-ਘੱਟ ਦੋ ਫਾਇਲਾਂ ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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: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"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "ਹੋਸਟ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "%2$s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ %1$s"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ \"%s\" ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
 
-#: 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
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਮਨਜ਼ੂਰ ਹੈ"
 
-#: 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
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:426
 #, 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: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
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
 
-#: 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
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: 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
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ਆਉਟਪੁੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
 
-#: 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
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "ਸੁਨੇਹਾ ਚੋਣ:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            ਕੀਤਾ ਅਨੁਵਾਦ ਰੱਖੋ, ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          ਨਾ-ਅਨੁਵਾਦ ਰੱਖੋ, ਕੀਤਾ ਅਨੁਵਾਦ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ਬਰਤਰਫ਼ #~ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ਸਭ ਸੁਨੇਹੇ ਅਸਪਸ਼ਟ ('fuzzy') ਬਣਾਓ\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:475
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+#| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
+
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:484
+#, c-format
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਸੰਟੈਕਸ:\n"
 
-#: 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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "ਆਉਟਪੁੱਟ ਵੇਰਵਾ:\n"
 
-#: 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
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:940
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:942
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:944
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:946
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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: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
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: 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
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1052,7 +1393,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
@@ -1066,23 +1407,23 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ਇੰਪੁੱਟ ਫਾਇਲਾਂ\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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:385 src/msgen.c:319 src/msgfmt.c:670
-#: src/xgettext.c:838
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1108,58 +1449,60 @@ msgid ""
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
-#: src/msgmerge.c:557
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
-#: src/msgmerge.c:559
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msguniq.c:379
+#: src/msgcat.c:429 src/msguniq.c:380
 #, 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:339 src/msgmerge.c:565
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --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:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "ਪੀਟਰ ਮਿੱਲਰ"
 
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਨਹੀਂ ਦਿੱਤੀਆਂ ਗਈਆਂ"
 
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "ਠੀਕ 2 ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਹੀ ਚਾਹੀਦੀਆਂ ਹਨ"
 
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "ਵਰਤੋ: %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1170,37 +1513,39 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      ਅਨੁਵਾਦ\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ਸਰੋਤ ਲਈ ਹਵਾਲਾ/ਰੈਫਰੈਂਸ\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮਾਡੀਫਾਇਰ:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:548
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 
-#: src/msgcmp.c:245
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             fuzzy ਐਂਟਰੀਆਂ ਮੰਨੋ\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
@@ -1215,17 +1560,17 @@ msgstr "ਇਹ ਸੁਨੇਹੇ ਨਾ-ਅਨੁਵਾਦਿਤ ਹੈ"
 msgid "this message needs to be reviewed by the translator"
 msgstr "ਇਹ ਸੁਨੇਹੇ ਨੂੰ ਅਨੁਵਾਦਕ ਵਲੋਂ ਰੀਵਿਊ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਗਿਆ ਹੈ, ਪਰ ਦਿੱਤਾ ਕੀਤੇ ਨਹੀਂ ਗਿਆ..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ਇਹ ਪ੍ਰੀਭਾਸ਼ਾ ਰਲਦੀ ਮਿਲਦੀ ਹੈ"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, ਪਰ %s ਵਿੱਚ ਪਰਿਭਾਸ਼ਿਤ ਨਹੀਂ ਹੈ"
@@ -1235,7 +1580,7 @@ msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, �
 msgid "warning: this message is not used"
 msgstr "ਸਾਵਧਾਨ: ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਨਹੀਂ ਗਿਆ ਹੈ"
 
-#: src/msgcmp.c:553 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1255,7 +1600,7 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1267,65 +1612,67 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:961
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:306
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:330
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "ਕਨਵਰਜ਼ਨ ਟਾਰਗੇਟ:\n"
 
-#: src/msgconv.c:334
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ ਮੌਜੂਦਾ ਲੋਕੇਲ ਦੀ ਇੰਕੋਡਿੰਗ ਹੈ।\n"
 
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ"
 
-#: src/msgen.c:253
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "ਠੀਕ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਚਾਹੀਦੀ ਹੈ"
 
-#: src/msgen.c:298
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1334,22 +1681,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:315
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਜਾਂ POT ਫਾਇਲ\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "ਗੁੰਮ ਕਮਾਂਡ ਨਾਂ"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1359,426 +1706,579 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:276
 #, 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:281 src/msgfilter.c:401
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "ਸਟੈਂਡਰਡ ਇੰਪੁੱਟ"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "stdout ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: src/msgexec.c:389
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: src/msgfilter.c:289
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "ਗੁੰਮ ਫਿਲਟਰ ਨਾਂ"
 
-#: src/msgfilter.c:313
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:388
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:392
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "ਅਨੁਵਾਦ ਕੈਟਾਲਾਗ ਲਈ ਸਭ ਅਨੁਵਾਦ ਉੱਤੇ ਇੱਕ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ।\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:441
 #, 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:421
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:425
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:454
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:304
+#: src/msgfilter.c:665
+#, c-format
+msgid "filter output is not terminated with a newline"
+msgstr ""
+
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:351
+#: src/msgfmt.c:419
 #, c-format
 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:268 src/xgettext.c:590
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "ਉਲਰਿਚ ਡਰਿੱਪਰ"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:471
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-d directory\" ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:362 src/msgunfmt.c:368
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr ""
+
+#: src/msgfmt.c:626 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:484 src/msgfmt.c:490
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ \"%s\" ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
+
 #. 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
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:620
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ਅਨੁਵਾਦ ਕੀਤਾ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਅਨੁਵਾਦ ਕੀਤੇ ਸੁਨੇਹੇ"
 
-#: src/msgfmt.c:625
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
 msgstr[1] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
 
-#: src/msgfmt.c:630
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਾ"
 msgstr[1] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹੇ"
 
-#: src/msgfmt.c:650
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "ਟੈਕਸਟ ਅਨੁਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
 
-#: 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:666
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ਇੰਪੁੱਟ ਫਾਇਲ ਨਾਂ\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
 
-#: src/msgfmt.c:675
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 
-#: src/msgfmt.c:677
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:679
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:681
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 
-#: src/msgfmt.c:683
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:685
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "  FILE ...                    input .mo files\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "  FILE ...                    ਇੰਪੁੱਟ .mo ਫਾਇਲਾਂ\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:694 src/xgettext.c:849
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:697
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr "  -l, --locale=LOCALE         ਲੋਕੇਲ ਨਾਂ, ਜਾਂ ਭਾਸ਼ਾ ਨਾਂ ਜਾਂ ਭਾਸ਼ਾ_ਦੇਸ਼ \n"
 
-#: src/msgfmt.c:703
+#: src/msgfmt.c:963
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:965
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
 
-#: src/msgfmt.c:705
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:711
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 
-#: src/msgfmt.c:719
+#: src/msgfmt.c:981
 #, 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:723
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:991
 #, 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:741 src/xgettext.c:865
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of classes directory "
+#| "hierarchy\n"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, 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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
 
-#: src/msgfmt.c:743
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:748
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:758
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             ਆਉਟਪੁੱਟ ਵਿੱਚ ਅਸਪਸ਼ਟ (fuzzy) ਐਂਟਰੀਆਂ ਵਰਤੋਂ\n"
 
-#: src/msgfmt.c:763
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:765
+#: src/msgfmt.c:1060
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:1063
+#, c-format
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ਅਨੁਵਾਦ ਬਾਰੇ ਅੰਕੜੇ ਪੇਸ਼ ਕਰੋ\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:890
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਗੁੰਮ ਹੈ ਜਾਂ ਗਲਤ ਹੈ\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "ਸਾਵਧਾਨ: charset ਬਦਲਣਾ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ\n"
 
-#: src/msgfmt.c:903
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
-
-#: 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:929
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ਡੋਮੇਨ ਨਾਂ \"%s\" ਫਾਇਲ ਨਾਂ ਲਈ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:948
+#: src/msgfmt.c:1230
 #, c-format
-msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1008
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "ਖਾਲੀ `msgstr' ਐਂਟਰੀ ਅਣ-ਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1009
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ਅਸਪਸ਼ਟ `msgstr' ਐਂਟਰੀ ਅਣਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1058
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ ਹੋ ਸਕਦਾ ਹੈ"
 
-#: 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
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/msggrep.c:496
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
 msgstr ""
 
-#: src/msggrep.c:516
+#: src/msggrep.c:521
 #, 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:542
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1818,29 +2318,32 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:597
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:618
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:620
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ਆਉਟਪੁੱਟ ਨੂੰ ਫਾਇਲ ਟਿਕਾਣੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ\n"
 
-#: src/msginit.c:297
+#: src/msginit.c:299
+#, c-format
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1851,12 +2354,12 @@ msgstr ""
 "--locale ਚੋਣ ਰਾਹੀਂ ਲੋਕਲ ਦਿਉ ਜੀ ਜਾਂ\n"
 "--output-file ਚੋਣ ਰਾਹੀਂ output.po ਫਾਇਲ ਦਿਉ।\n"
 
-#: src/msginit.c:347
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s ਬਣਾਈ।\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -1865,41 +2368,44 @@ msgstr ""
 "ਨਵੀਂ PO ਫਾਇਲ ਬਣਾਉ, ਯੂਜ਼ਰ ਦੇ ਇੰਵਾਇਰਨਮੈਂਟ ਤੋਂ ਮੁੱਲ ਲੈ ਕੇ ਮੇਟਾ ਜਾਣਕਾਰੀ ਸ਼ੁਰੂ\n"
 " ਕਰੋ।\n"
 
-#: src/msginit.c:377
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ POT ਫਾਇਲ\n"
 
-#: src/msginit.c:379
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:385
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:391
 #, 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:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          ਟਾਰਗੇਟ ਲੋਕੇਲ ਸੈੱਟ ਕਰੋ\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:468
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1907,12 +2413,12 @@ msgstr ""
 "ਇੱਕ ਤੋਂ ਵੱਧ .pot ਫਾਇਲਾਂ ਲੱਭੀਆਂ।\n"
 "--input ਚੋਣ ਰਾਹੀਂ input.pot ਫਾਇਲ ਦਿਉ ਜੀ।\n"
 
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/msginit.c:489
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1920,61 +2426,70 @@ msgstr ""
 "ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਕੋਈ ਵੀ .pot ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ।\n"
 "--input ਚੋਣ ਰਾਹੀਂ input.pot ਫਾਇਲ ਦਿਉ ਜੀ।\n"
 
-#: 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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s ਪੈਕੇਜ ਲਈ ਅੰਗਰੇਜ਼ੀ ਅਨੁਵਾਦ"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਦੋ ਵੱਖ ਵੱਖ charsets \"%s\" ਅਤੇ \"%s\""
 
 #: src/msgl-cat.c:203
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
-msgstr ""
+#, fuzzy, c-format
+#| msgid ""
+#| "input file doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
 
 #: 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 ""
+#, fuzzy, c-format
+#| msgid ""
+#| "input file doesn't contain a header entry with a charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 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:3015
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "ਸਾਵਧਾਨ: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -1983,15 +2498,16 @@ msgstr ""
 "ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਲਈ ਵੱਖ ਵੱਖ ਇੰਕੋਡਿੰਗ ਹਨ, UTF-8 ਸਮੇਤ ਹੋਰ।\n"
 "ਆਉਟਪੁੱਟ ਨੂੰ UTF-8 ਵਿੱਚ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ।\n"
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2000,7 +2516,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2013,12 +2529,12 @@ msgstr ""
 "'%s' ਦੀ ਆਉਟਪੁੱਟ ਗਲਤ ਹੋ ਸਕਦੀ ਹੈ।\n"
 "ਸੰਭਵ ਹੱਲ ਹਨ:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2026,7 +2542,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2035,7 +2551,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2043,133 +2559,161 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "ਅੱਗੇ ਦਿੱਤੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਸਿਸ਼ ਕਰੋ, %s ਲਈ ਠੀਕ:"
 
-#: src/msgl-check.c:352 src/msgl-check.c:376
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਵਿੱਚ ਬਹੁਵਚਨ ਰੂਪ ਵਿੱਚ ਅਨੁਵਾਦ ਹੈ"
 
-#: src/msgl-check.c:354
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ਪਰ ਹੈੱਡਰ ਐਂਟਰੀ ਵਿੱਚ \"plural=EXPRESSION\" ਗੁਣ ਨਹੀਂ ਹੈ"
 
-#: src/msgl-check.c:378
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:414
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ਗਲਤ nplurals ਮੁੱਲ"
 
-#: src/msgl-check.c:436
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ਗਲਤ ਬਹੁਵਚਨ ਸਮੀਕਰਨ"
 
-#: src/msgl-check.c:466 src/msgl-check.c:482
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:468
+#: src/msgl-check.c:478
 #, 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] "ਪਰ ਕੁਝ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਕੇਵਲ %lu ਬਹੁਵਚਨ ਰੂਪ ਹਨ"
 
-#: src/msgl-check.c:484
+#: src/msgl-check.c:494
 #, 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:508
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:602
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
 
-#: src/msgl-check.c:610
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:625
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr ""
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:643
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr ""
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
 
-#: src/msgl-check.c:651
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr ""
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:666
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr ""
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "ਬਹੁਵਚਨ ਹੈਡਲਿੰਗ ਗਨੂ gettext ਇਕਸਟੈਨਸ਼ਨ ਹੈ"
 
-#: src/msgl-check.c:720
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ ਐਕਸਰਲੇਟਰ ਮਾਰਕ '%c' ਦੀ ਕਮੀ ਹੈ"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:776
-#, c-format
-msgid "header field `%s' missing in header\n"
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "header field `%s' still has the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
+msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
+
+#: src/msgl-check.c:835
+#, fuzzy, c-format
+#| msgid "header field `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
 msgstr "ਹੈੱਡਰ ਵਿੱਚ `%s' ਹੈੱਡਰ ਖੇਤਰ ਗੁੰਮ ਹੈ\n"
 
-#: 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:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:809
-msgid "some header fields still have the initial default value\n"
-msgstr "ਕੁਝ ਹੈੱਡਰ ਖੇਤਰ ਹਾਲੇ ਵੀ ਮੁੱਢਲੇ ਮੁੱਲ ਰੱਖਦੇ ਹਨ\n"
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
 
-#: src/msgl-check.c:826
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
 #, c-format
-msgid "header field `%s' still has the initial default value\n"
-msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2181,37 +2725,43 @@ msgstr ""
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
 
-#: 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
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:699
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ਕੇਵਲ %s ਨਾਲ ਠੀਕ ਹੈ"
 
-#: src/msgmerge.c:448
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "ਬੈਕਅੱਪ ਕਿਸਮ"
 
-#: src/msgmerge.c:485
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2225,54 +2775,55 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      ਪੁਰਾਣੇ ਸੋਰਤ ਲਈ ਰੈਫਰੈਂਸ ਅਨੁਵਾਦ\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ਨਵੇਂ ਸਰੋਤ ਲਈ ਰੈਫਰੈਂਸ\n"
 
-#: src/msgmerge.c:508
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "ਆਉਟਪੁੱਟ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgmerge.c:528
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:530
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:534
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2280,40 +2831,50 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:541
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:610
+#, c-format
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਬਹੁਵਚਨ ਰੂਪ ਦਰਸਾਉਂਦਾ ਹੈ"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
-#: src/urlget.c:435
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " ਮੁਕੰਮਲ।\n"
@@ -2335,7 +2896,9 @@ msgstr ""
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 
 #: src/msgunfmt.c:442
@@ -2345,12 +2908,15 @@ msgstr ""
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 
 #: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
 #: src/msgunfmt.c:451
@@ -2366,7 +2932,8 @@ msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਇੰਪੁੱਟ ਫਾਇਲ ਟ�
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
@@ -2404,7 +2971,7 @@ msgstr ""
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:330
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2417,14 +2984,16 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:363
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:365
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
@@ -2439,35 +3008,35 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:556
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
 msgstr "ਪਾਰਸ ਗਲਤੀਆਂ ਨੂੰ ਛੱਡ ਕੇ, ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
 
-#: src/po-charset.c:579
+#: src/po-charset.c:580
 msgid "Continuing anyway."
 msgstr "ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
 
-#: src/po-charset.c:606
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:643
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2475,32 +3044,35 @@ msgstr ""
 "ਹੈੱਡਰ ਵਿੱਚ Charset ਮੌਜੂਦ ਨਹੀਂ।\n"
 "ਯੂਜ਼ਰ ਦੇ charset ਵਿੱਚ ਸੁਨੇਹਾ ਬਦਲਣ ਨਾਲ ਕੰਮ ਨਹੀਂ ਚੱਲੇਗਾ।\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ ਦੀ ਅਨਿਯਮਤ ਵਰਤੋਂ"
 
-#: src/po-gram-gen.y:240
-#, c-format
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "`msgstr[]' ਭਾਗ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: src/po-gram-gen.y:249
-#, c-format
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "ਨਾ-ਮੌਜੂਦ `msgid_plural' ਭਾਗ"
 
-#: src/po-gram-gen.y:257
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "ਨਾ-ਮੌਜੂਦ `msgstr' ਭਾਗ"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "ਬਹੁਵਚਨ ਰੂਪ ਦਾ ਗਲਤ ਇੰਡੈਕਸ"
@@ -2510,7 +3082,7 @@ msgstr "ਬਹੁਵਚਨ ਰੂਪ ਦਾ ਗਲਤ ਇੰਡੈਕਸ"
 msgid "too many errors, aborting"
 msgstr "ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤੀਆਂ, ਅਧੂਰਾ ਛੱਡਿਆ"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
@@ -2520,77 +3092,113 @@ msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv ਫੇਲ੍ਹ"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ਕੀਬੋਰਡ \"%s\" ਅਣਜਾਣ"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ਗਲਤ ਕੰਟਰੋਲ ਲੜੀ"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1003
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:377
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹਾ ਪ੍ਰੀਭਾਸ਼ਾ"
 
-#: src/read-catalog.c:379
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr ""
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "ਗੁੰਮ ਫਿਲਟਰ ਨਾਂ"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "ਗਲਤ nplurals ਮੁੱਲ"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ਫਾਇਲ \"%s\" ਕੱਟੀ-ਵੱਢੀ ਹੈ"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr ""
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "ਫਾਇਲ \"%s\" GNU .mo ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
 
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "warning: invalid \\uxxxx syntax for Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr ""
@@ -2603,7 +3211,7 @@ msgstr "ਸਾਵਧਾਨ: ਸੰਟੈਕਸ ਗਲਤੀ"
 msgid "warning: unterminated key/value pair"
 msgstr ""
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 
@@ -2611,7 +3219,7 @@ msgstr ""
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s ਅਤੇ %s ਵਲੋਂ ਲਿਖਿਆ।\n"
@@ -2620,139 +3228,168 @@ msgstr "%s ਅਤੇ %s ਵਲੋਂ ਲਿਖਿਆ।\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "ਡਾਂਇਲੋ ਸਿਗਨ"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "ਇੰਪੁੱਟ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" ਇੰਕੋਡਿੰਗ ਤੋਂ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "ਦੋ ਆਰਗੂਮੈਂਟ ਲੋੜੀਦੇ ਹਨ"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] URL FILE\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, 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:234
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "stdout ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/urlget.c:264
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
+
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "%s ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: src/urlget.c:307
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " ਟਾਈਮ-ਆਉਟ।\n"
 
-#: src/urlget.c:443
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " ਫੇਲ੍ਹ ਹੈ।\n"
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr ""
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr ""
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr ""
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ \"%s\" ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "ਡਾਇਰੈਕਟਰੀ \"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1080
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
 
-#: src/write-java.c:1165
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1168
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
 
-#: src/write-po.c:802
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:1253 src/write-po.c:1382
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2761,7 +3398,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1265 src/write-po.c:1394
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2770,76 +3407,101 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr ""
 
-#: src/write-resources.c:131
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1074
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr ""
+
+#: src/x-c.c:1344
+#, c-format
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr ""
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1247
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2020
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -2871,7 +3533,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ਫੇਲ੍ਹ"
@@ -2883,450 +3545,723 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1281
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: 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: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:494
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/x-perl.c:308
-#, c-format
-msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-
-#: src/x-perl.c:1043
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
-
-#: src/x-perl.c:1163
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1183
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1217
-#, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1230
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-perl.c:1247
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
-
-#: src/x-python.c:236
-msgid ""
-"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/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
 
-#: src/x-python.c:282
+#: src/xgettext.c:646
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/xgettext.c:701
 #, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: src/x-python.c:322
+#: src/xgettext.c:839
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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:679
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ੍ਰੀਭਾਸ਼ਾ"
-
-#: src/x-rst.c:172
-#, c-format
-msgid "%s:%d: missing number after #"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/x-rst.c:207
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr ""
-
-#: 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:621
-#, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-
-#: src/xgettext.c:626
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
-
-#: src/xgettext.c:769
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
-msgstr ""
-
-#: src/xgettext.c:820
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 
-#: src/xgettext.c:845
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:852
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:1061
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:860
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:870
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:875
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
 
-#: src/xgettext.c:887
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
 
-#: src/xgettext.c:889 src/xgettext.c:896
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:893
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=FILE       ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:923
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:948
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:963
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "  -s, --short                 short host name\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "  -s, --short                 ਛੋਟਾ ਹੋਸਟ ਨਾਂ\n"
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:965
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
 
-#: src/xgettext.c:969
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
 
-#: src/xgettext.c:971
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਐਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਐਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
 
-#: src/xgettext.c:973
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:976
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1782
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1881
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "ਸਟੈਂਡਰਡ ਇੰਪੁੱਟ"
 
-#: src/xgettext.c:1985
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:1989
+#: src/x-javascript.c:291
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:1994
+#: src/x-javascript.c:303
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
+#: src/x-javascript.c:312
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: ਸਾਵਧਾਨ: "
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
 
-#: src/xgettext.c:2103
+#: src/x-javascript.c:344
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
 msgstr ""
 
-#: src/xgettext.c:2104
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/xgettext.c:2135
+#: src/x-perl.c:1074
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/xgettext.c:2197
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr ""
+
+#: src/x-python.c:279
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"ਖਾਲੀ msgid ਹੈ। ਇਹ ਗਨੂ gettext ਵਲੋਂ ਰਾਖਵਾਂ ਹੈ।\n"
-"gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
-"ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
 
-#: src/xgettext.c:2834
+#: src/x-python.c:325
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2861
+#: src/x-python.c:342
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
 
-#: src/xgettext.c:2886
+#: src/x-python.c:355
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:2907
+#: src/x-python.c:365
 #, c-format
-msgid "context mismatch between singular and plural form"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:3016
+#: src/x-python.c:398
+#, c-format
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/xgettext.c:3226
+#: src/x-python.c:654
 #, c-format
-msgid "language `%s' unknown"
-msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ੍ਰੀਭਾਸ਼ਾ"
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr ""
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr ""
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ੍ਰੀਭਾਸ਼ਾ"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ੍ਰੀਭਾਸ਼ਾ"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<ਬਿਨ-ਨਾਂ>"
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "ਗਲਤ ਕੰਟਰੋਲ ਲੜੀ"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "ਗਲਤ ਕੰਟਰੋਲ ਲੜੀ"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "ਗਲਤ ਅੰਤ(endianness): %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "%2$s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ %1$s"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "ਗੁੰਮ ਫਿਲਟਰ ਨਾਂ"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ਚੋਣ '--%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ਅਣਜਾਣ ਚੋਣ '--%s'\n"
+
+#, fuzzy, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: ਚੋਣ '-W %s' ਸਧਾਰਨ ਹੈ।\n"
+
+#, fuzzy, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: ਚੋਣ '-W %s' ਲਈ ਕੋਈ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਚਾਹੀਦਾ\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "ਸਾਵਧਾਨ: msgfmt ਦਾ ਪੁਰਾਣਾ ਵਰਜਨ ਇਸ ਉੱਤੇ ਗਲਤੀ ਦੇਵੇਗਾ\n"
+
+#, c-format
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਲਾਈਨ ਦੇ ਸ਼ੁਰੂ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "ਕੁਝ ਹੈੱਡਰ ਖੇਤਰ ਹਾਲੇ ਵੀ ਮੁੱਢਲੇ ਮੁੱਲ ਰੱਖਦੇ ਹਨ\n"
+
+#, c-format
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: ਸਾਵਧਾਨ: "
+
+#~ 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 ""
+#~ "ਖਾਲੀ msgid ਹੈ। ਇਹ ਗਨੂ gettext ਵਲੋਂ ਰਾਖਵਾਂ ਹੈ।\n"
+#~ "gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
+#~ "ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index 2eafc14c9..f5f14806b 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-01 12:15+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -19,19 +19,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "błędny argument %s opcji %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "niejednoznaczny argument %s opcji %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Prawidłowe argumenty to:"
 
@@ -59,201 +61,185 @@ msgstr "nie można usunąć katalogu tymczasowego %s"
 msgid "write error"
 msgstr "błąd zapisu"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "zachowanie uprawnień do %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "błąd w czasie otwierania %s do czytania"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "błąd otwarcia kopii zapasowej %s do pisania"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "błąd czytania %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "błąd pisania do %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() nie powiodło się"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Nie znaleziono kompilatora C#, proszę zainstalować pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Nie znaleziono maszyny wirtualnej C#, proszę zainstalować pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "niepowodzenie podprocesu %s"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcja: „%s” jest niejednoznaczna; możliwości:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: opcja „%s” jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: opcja: „%s” jest niejednoznaczna; możliwości:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nierozpoznana opcja „%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: opcja „%c%s” nie może mieć argumentu\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: opcja „--%s” wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nierozpoznana opcja „--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nierozpoznana opcja „%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: błędna opcja -- „%c”\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga argumentu -- „%c”\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcja „-W %s” wymaga argumentu\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "błędny argument source_version do compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "błędny argument target_version do compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tworzenie \"%s\" nie powiodło się"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "błąd podczas pisania do pliku \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Nie znaleziono kompilatora Javy, proszę zainstalować gcj lub ustawić $JAVAC"
+msgstr ""
+"Nie znaleziono kompilatora Javy, proszę zainstalować gcj lub ustawić $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Nie znaleziono maszyny wirtualnej Javy, proszę zainstalować gij lub ustawić $JAVA"
+msgstr ""
+"Nie znaleziono maszyny wirtualnej Javy, proszę zainstalować gij lub ustawić "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "błąd wejścia/wyjścia podprocesu %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "kompilacja wątków nie udała się"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "pisanie do podprocesu %s nie powiodło się"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "czytanie z podprocesu %s nie powiodło się"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nie można ustawić nieblokującego wejścia/wyjścia dla podprocesu %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikacja z podprocesem %s nie powiodła się"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s zakończony z kodem wyjścia %d"
@@ -277,13 +263,13 @@ msgstr "podproces %s zakończony z kodem wyjścia %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "”"
 
@@ -292,64 +278,69 @@ msgstr "”"
 msgid "setting permissions for %s"
 msgstr "ustawienie uprawnień do %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "nie można utworzyć potoku"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "błąd _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nie można odtworzyć deskryptora pliku nr %d: niepowodzenie dup2()"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "podproces %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s otrzymał krytyczny sygnał %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Składnikiem początkowym musi być <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Składnik <%s> nie zawiera składnika <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Składnik <%s> nie ma atrybutu <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Składnia: %s [OPCJA...] [LOKALIZACJA REGUŁY]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -365,7 +356,7 @@ msgstr ""
 "odpowiednim do użycia przez gettext. Jeżeli nie są podane argumenty, reguły\n"
 "CLRD czytane są ze standardowego wejścia.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,27 +365,29 @@ msgstr ""
 "Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
 "Podobnie dla argumentów opcjonalnych.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  wypisanie reguł liczby mnogiej w formacie CLRD\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  wypisanie reguł liczby mnogiej w formacie "
+"CLRD\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, 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/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, 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"
@@ -403,25 +396,30 @@ msgstr "  -V, --version               wypisanie informacji o wersji i zakończen
 #. 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 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"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -430,77 +428,79 @@ msgstr ""
 "To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
 "Autorzy NIE DAJĄ GWARANCJI, na ile pozwala na to prawo.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Program napisał %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s nie może zostać przeczytany"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "nie można wczytać reguł dla %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "nie można zrozumieć reguły CLRD"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "nadmiarowy argument %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "błąd w czasie otwierania \"%s\" do czytania"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "specyfikacja formatu dla argumentu %u, obecna w „%s”, nie istnieje w „%s”"
+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 „%s”"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "różniące się specyfikacje formatu w „%s” i „%s” dla argumentu %u"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Dyrektywa numer %u zaczyna się od |, ale nie kończy |."
@@ -512,56 +512,69 @@ msgstr ""
 "'%s' nie jest poprawnym formatem %s w przeciwieństwie do „%s”.\n"
 "Powód: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "W dyrektywie numer %u oznaczenie po „<” nie jest nazwą makra specyfikującego format. Poprawne nazwy makr są podane w rozdziale 7.8.1 ISO C 99."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"W dyrektywie numer %u oznaczenie po „<” nie jest nazwą makra specyfikującego "
+"format. Poprawne nazwy makr są podane w rozdziale 7.8.1 ISO C 99."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "W dyrektywie numer %u oznaczenie po „<” nie jest zakończone przez „>”."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"Napis odwołuje się do argumentu numer %u, ale ignoruje argument numer %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "nie zgadza się liczba specyfikacji formatu w „%s” i w „%s”"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "W dyrektywie numer %u po „{” nie występuje numer argumentu."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "W dyrektywie numer %u po „,” nie występuje liczba."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Łańcuch kończy się w środku dyrektywy: znaleziono „{” bez odpowiadającego „}”."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Łańcuch kończy się w środku dyrektywy: znaleziono „{” bez odpowiadającego "
+"„}”."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Dyrektywa numer %u kończy się błędnym znakiem „%c” zamiast „}”."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Dyrektywa numer %u kończy się błędnym znakiem zamiast „}”."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Łańcuch zaczyna się w środku dyrektywy: znaleziono „}” bez odpowiadającego „{”."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Łańcuch zaczyna się w środku dyrektywy: znaleziono „}” bez odpowiadającego "
+"„{”."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Łańcuch zawiera samotny „}” po numerze dyrektywy %u."
@@ -574,17 +587,25 @@ msgstr "Błędne połączenie flag w dyrektywie numer %u."
 #: 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”."
+msgstr ""
+"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed „%c”."
 
 #: 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 "W dyrektywie numer %u numer argumentu specyfikacji dokładności musi być równy %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"W dyrektywie numer %u numer argumentu specyfikacji dokładności musi być "
+"równy %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed „%c”."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"W dyrektywie numer %u specyfikacja dokładności nie jest dozwolona przed „%c”."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -621,93 +642,136 @@ msgid "The string ends in the middle of a directive."
 msgstr "Łańcuch kończy się w środku dyrektywy."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Łańcuch odwołuje się do argumentów jednocześnie poprzez bezwzględne numery argumentów i nienumerowane specyfikacje."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Łańcuch odwołuje się do argumentów jednocześnie poprzez bezwzględne numery "
+"argumentów i nienumerowane specyfikacje."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "W dyrektywie numer %u numer argumentu 0 nie jest dodatnią liczbą całkowitą."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"W dyrektywie numer %u numer argumentu 0 nie jest dodatnią liczbą całkowitą."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "W dyrektywie numer %u numer argumentu szerokości 0 nie jest dodatnią liczbą całkowitą."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"W dyrektywie numer %u numer argumentu szerokości 0 nie jest dodatnią liczbą "
+"całkowitą."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "W dyrektywie numer %u numer argumentu precyzji 0 nie jest dodatnią liczbą całkowitą."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"W dyrektywie numer %u numer argumentu precyzji 0 nie jest dodatnią liczbą "
+"całkowitą."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "W dyrektywie numer %u znak „%c” nie jest poprawną specyfikacją konwersji."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"W dyrektywie numer %u znak „%c” nie jest poprawną specyfikacją konwersji."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Znak kończący dyrektywę numer %u nie jest poprawną specyfikacją konwersji."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Znak kończący dyrektywę numer %u nie jest poprawną specyfikacją konwersji."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Łańcuch odwołuje się do argumentu numer %u na niekompatybilne sposoby."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "W dyrektywie numer %u podciąg \"%s\" nie jest poprawnym stylem daty/czasu."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"W dyrektywie numer %u podciąg \"%s\" nie jest poprawnym stylem daty/czasu."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "W dyrektywie numer %u po \"%s\" nie występuje przecinek."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "W dyrektywie numer %u podciąg \"%s\" nie jest poprawnym stylem liczby."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "W dyrektywie numer %u po numerze argumentu nie występuje przecinek i jedno z \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"W dyrektywie numer %u po numerze argumentu nie występuje przecinek i jedno z "
+"\"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "W dyrektywie numer %u wybór nie zawiera liczby."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "W dyrektywie numer %u wybór zawiera liczbę, po której nie występuje „<”, „#” ani „%s”."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"W dyrektywie numer %u wybór zawiera liczbę, po której nie występuje „<”, „#” "
+"ani „%s”."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-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 „%s”"
+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 „%s”"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "specyfikacje formatu w „%s” i w „%s” dla argumentu {%u} nie są takie same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"specyfikacje formatu w „%s” i w „%s” dla argumentu {%u} nie są takie same"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Napis odwołuje się do argumentu numer %u, ale ignoruje argumenty numer %u i %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Napis odwołuje się do argumentu numer %u, ale ignoruje argumenty numer %u i "
+"%u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "specyfikacja formatu dla argumentów %u i %u nie istnieje w „%s”; tylko jeden argument może być ignorowany"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"specyfikacja formatu dla argumentów %u i %u nie istnieje w „%s”; tylko jeden "
+"argument może być ignorowany"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -718,17 +782,27 @@ msgstr "błąd w czasie przetwarzania %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "W dyrektywie numer %u parametr %u jest typu „%s” zamiast oczekiwanego „%s”."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"W dyrektywie numer %u parametr %u jest typu „%s” zamiast oczekiwanego „%s”."
 
 # plural
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametru."
-msgstr[1] "Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametrów."
-msgstr[2] "Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametrów."
+msgid ""
+"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."
+msgstr[0] ""
+"Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametru."
+msgstr[1] ""
+"Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametrów."
+msgstr[2] ""
+"Za dużo parametrów w dyrektywie numer %u, oczekiwano najwyżej %u parametrów."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -758,8 +832,12 @@ msgstr "W dyrektywie numer %u podano jednocześnie modyfikatory @ i :."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "W dyrektywie numer %u po „~:[” nie występują dwa wyrażenia oddzielone przez „~;”."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"W dyrektywie numer %u po „~:[” nie występują dwa wyrażenia oddzielone przez "
+"„~;”."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -781,15 +859,19 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "specyfikacje formatu w „%s” nie są podzbiorem tych z „%s”"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "W dyrektywie numer %u specyfikacja rozmiaru jest niezgodna ze specyfikacją konwersji „%c”."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"W dyrektywie numer %u specyfikacja rozmiaru jest niezgodna ze specyfikacją "
+"konwersji „%c”."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -808,8 +890,11 @@ msgstr "W dyrektywie numer %u „%c” nie może być początkiem argumentu geti
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "W dyrektywie numer %u w specyfikacji formatu nie może być więcej poziomów zagłębień."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"W dyrektywie numer %u w specyfikacji formatu nie może być więcej poziomów "
+"zagłębień."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -817,122 +902,157 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "W dyrektywie numer %u jest niezakończona dyrektywa formatu."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Łańcuch odwołuje się do argumentów jednocześnie poprzez nazwy i nienazwane specyfikacje."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Łańcuch odwołuje się do argumentów jednocześnie poprzez nazwy i nienazwane "
+"specyfikacje."
 
 #: 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."
+msgstr ""
+"Łańcuch odwołuje się do argumentu o nazwie „%s” na niekompatybilne sposoby."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "specyfikacje formatu w „%s” potrzebują mapowania, a te w „%s” potrzebują krotki"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"specyfikacje formatu w „%s” potrzebują mapowania, a te w „%s” potrzebują "
+"krotki"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "specyfikacje formatu w „%s” potrzebują krotki, a te w „%s” potrzebują mapowania"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"specyfikacje formatu w „%s” potrzebują krotki, a te w „%s” potrzebują "
+"mapowania"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "specyfikacja formatu dla argumentu „%s”, obecna w „%s”, nie istnieje w „%s”"
+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 „%s”"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "specyfikacje formatu w „%s” i w „%s” dla argumentu „%s” nie są takie same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"specyfikacje formatu w „%s” i w „%s” dla argumentu „%s” nie są takie same"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "„%s” jest w prostym formacie, a „%s” nie jest: zawiera flagę „L” albo dwucyfrową liczbę argumentów"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"„%s” jest w prostym formacie, a „%s” nie jest: zawiera flagę „L” albo "
+"dwucyfrową liczbę argumentów"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Zmienna powłoki, do której odwołuje się łańcuch znaków ma nazwę nie ze znaków ASCII."
+msgstr ""
+"Zmienna powłoki, do której odwołuje się łańcuch znaków ma nazwę nie ze "
+"znaków ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Zmienna powłoki, do której odwołuje się łańcuch znaków ma skomplikowaną składnię nawiasów. Ta składnia nie jest używana z powodów bezpieczeństwa."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Zmienna powłoki, do której odwołuje się łańcuch znaków ma skomplikowaną "
+"składnię nawiasów. Ta składnia nie jest używana z powodów bezpieczeństwa."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Zmienna powłoki, do której odwołuje się łańcuch znaków może mieć inną wartość wewnątrz funkcji powłoki."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Zmienna powłoki, do której odwołuje się łańcuch znaków może mieć inną "
+"wartość wewnątrz funkcji powłoki."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Zmienna powłoki, do której odwołuje się łańcuch znaków ma pustą nazwę."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "W dyrektywie numer %u znak „%c” nie jest cyfrą od 1 do 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Znak kończący dyrektywę %u nie jest cyfrą od 1 do 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "za dużo argumentów"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Składnia: %s [OPCJA]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Wypisanie nazwy komputera.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format wyjścia:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krótka nazwa komputera\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          długa nazwa komputera, zawierająca pełną nazwę\n"
+"  -f, --fqdn, --long          długa nazwa komputera, zawierająca pełną "
+"nazwę\n"
 "                                domeny i aliasy\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy komputera\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informacje:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "nie można odczytać nazwy komputera"
@@ -942,7 +1062,7 @@ msgstr "nie można odczytać nazwy komputera"
 msgid "selector is not specified"
 msgstr "nie zostął podany selektor"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "nie można utworzyć contekstu XPath"
@@ -952,28 +1072,28 @@ msgstr "nie można utworzyć contekstu XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "nie można rozwinąc wyrażenia XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "węzeł „%s” nie zawiera „%s”"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "błędna wartośc atrybutu „%s” dla „%s”"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "składnik początkowy w przestrzeni nazw %s nie ma nazwy „rules”"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "nie można odczytać %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "nie można rozwinąć ścieżki położenia XPath: %s"
@@ -993,28 +1113,28 @@ msgstr "nie można odczytać pliku XML „%s”"
 msgid "the root element is not \"locatingRules\""
 msgstr "składnikiem początkowym nie jest „locatingRules”"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dozwolony najwyżej jeden plik wejściowy"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s i %s wzajemnie się wykluczają"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1023,141 +1143,154 @@ msgstr ""
 "Filtrowanie komunikatów z katalogu tłumaczeń zgodnie z ich atrybutami oraz\n"
 "manipulowanie atrybutami.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Położenie pliku wejściowego:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  PLIK-WEJŚCIOWY              wczytanie pliku PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, 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"
+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:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Położenie pliku wyjściowego:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Wyniki są wypisywane na standardowe wyjście jeśli nie podano pliku lub podany\n"
+"Wyniki są wypisywane na standardowe wyjście jeśli nie podano pliku lub "
+"podany\n"
 "plik to -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Wybór komunikatów:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            zachowanie przetłumaczonych, usunięcie\n"
 "                                nie przetłumaczonych\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          zachowanie nie przetłumaczonych, usunięcie\n"
 "                                przetłumaczonych\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              usunięcie komunikatów oznaczonych „fuzzy”\n"
+msgstr ""
+"      --no-fuzzy              usunięcie komunikatów oznaczonych „fuzzy”\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            zachowanie komunikatów oznaczonych „fuzzy”\n"
+msgstr ""
+"      --only-fuzzy            zachowanie komunikatów oznaczonych „fuzzy”\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           usunięcie przestarzałych komunikatów #~\n"
+msgstr ""
+"      --no-obsolete           usunięcie przestarzałych komunikatów #~\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         zachowanie przestarzałych komunikatów #~\n"
+msgstr ""
+"      --only-obsolete         zachowanie przestarzałych komunikatów #~\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulowanie atrybutami:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             oznaczenie wszystkich komunikatów jako „fuzzy”\n"
+msgstr ""
+"      --set-fuzzy             oznaczenie wszystkich komunikatów jako "
+"„fuzzy”\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           oznaczenie wszystkich komunikatów jako\n"
 "                                nie będących „fuzzy”\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, 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:474
+#: src/msgattrib.c:473
 #, 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:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1167,192 +1300,231 @@ msgstr ""
 "                              przetłumaczonych komunikatów przy zaznaczaniu\n"
 "                              jako „fuzzy”\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        usunięcie \"previous msgid\" z wszystkich komunikatów\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        usunięcie \"previous msgid\" z wszystkich "
+"komunikatów\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
-"      --empty                 zmiana zawartości msgstr na pustą przy usuwaniu\n"
+"      --empty                 zmiana zawartości msgstr na pustą przy "
+"usuwaniu\n"
 "                                komunikatów oznaczonych „fuzzy”\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, 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"
+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:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=PLIK.po   modyfikacja tylko wpisów nieobecnych w PLIKU.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=PLIK.po   modyfikacja tylko wpisów nieobecnych w PLIKU."
+"po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonim dla --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              synonim dla --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              synonim dla --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Składnia pliku wejściowego:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, 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"
+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:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     plik wejściowy ma składnię .string z\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Szczegóły dotyczące wyjścia:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
-"      --color                 używanie zawsze kolorów i innych atrybutów tekstu\n"
+"      --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"
+"                              „always” (zawsze), „never” (nigdy), „auto” "
+"albo\n"
 "                              „html”.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=PLIKSTYLU       podanie pliku reguł CSS dla opcji --color\n"
+msgstr ""
+"      --style=PLIKSTYLU       podanie pliku reguł CSS dla opcji --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             nie używanie sekwencji C na wyjściu (domyślne)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             nie używanie sekwencji C na wyjściu "
+"(domyślne)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                używanie sekwencji C, bez znaków rozszerzonych\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                używanie sekwencji C, bez znaków "
+"rozszerzonych\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              zapisanie pliku PO nawet jeśli jest pusty\n"
+msgstr ""
+"      --force-po              zapisanie pliku PO nawet jeśli jest pusty\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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"
+msgstr ""
+"  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nie zapisywanie linii „#: plik:linia”\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          generowanie linii „#: plik:linia” (domyślne)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          generowanie linii „#: plik:linia” (domyślne)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                zapisanie pliku .po ściśle zgodnego z Uniforum\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                zapisanie pliku .po ściśle zgodnego z "
+"Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    zapisanie pliku .strings NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    zapisanie pliku .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=LICZBA          ustawienie szerokości strony dla wyjścia\n"
+msgstr ""
+"  -w, --width=LICZBA          ustawienie szerokości strony dla wyjścia\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               nie łamanie na wiele linii komunikatów dłuższych\n"
+"      --no-wrap               nie łamanie na wiele linii komunikatów "
+"dłuższych\n"
 "                                niż szerokość strony\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generowanie posortowanego wyjścia\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          sortowanie wyjścia według położenia pliku\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1374,32 +1546,34 @@ msgstr ""
 "i pozycje w plikach zostaną zgromadzone, chyba że zostanie podana opcja\n"
 "--use-first, wtedy będą skopiowane z pierwszego definiującego je pliku PO.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  PLIK-WEJŚCIOWY ...          pliki wejściowe\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=PLIK       odczytanie listy plików wejściowych z PLIKU\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:408 src/msgcomm.c:399
+#: 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 ""
 "  -<, --less-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
-"                                mniejszą od LICZBY, domyślnie nieskończoności\n"
+"                                mniejszą od LICZBY, domyślnie "
+"nieskończoności\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1408,7 +1582,7 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1417,14 +1591,17 @@ msgstr ""
 "  -u, --unique                skrót dla --less-than=2, żądanie wypisania\n"
 "                                wyłącznie unikalnych komunikatów\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      pliki wejściowe mają składnię .properties Javy\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      pliki wejściowe mają składnię .properties "
+"Javy\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1433,12 +1610,12 @@ msgstr ""
 "      --stringtable-input     pliki wejściowe mają składnię .strings\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAZWA         kodowanie dla wyjścia\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1447,32 +1624,33 @@ msgstr ""
 "      --use-first             użycie pierwszego dostępnego tłumaczenia\n"
 "                                każdego komunikatu zamiast łączenia wielu\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=NAZWA_KATALOGU   ustawienie pola „Language” w nagłówku\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "nie podano plików wejściowych"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "wymagane są dokładnie dwa pliki wejściowe"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Składnia: %s [OPCJA] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1490,72 +1668,78 @@ msgstr ""
 "dopasować dokładnie, używane jest dopasowywanie rozmyte dla lepszej\n"
 "diagnostyki.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      tłumaczenia\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odniesienia do źródeł\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modyfikatory operacji:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          zastosowanie ref.pot dla wszystkich domen def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          zastosowanie ref.pot dla wszystkich domen def."
+"po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) komunikatów\n"
+msgstr ""
+"      --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) "
+"komunikatów\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      użycie nieprzetłumaczonych komunikatów\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "ten komunikat jest nie przetłumaczony"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale ta definicja jest podobna"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "uwaga: ten komunikat nie został użyty"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1563,12 +1747,12 @@ msgstr[0] "znaleziono %d błąd krytyczny"
 msgstr[1] "znaleziono %d błędy krytyczne"
 msgstr[2] "znaleziono %d błędów krytycznych"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "muszą być podane przynajmniej dwa pliki"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1588,7 +1772,7 @@ msgstr ""
 "zostaną zachowane, ale tylko z pierwszego definiującego je pliku PO. Pozycje\n"
 "w plikach dla wszystkich plików PO zostaną zgromadzone.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1597,65 +1781,73 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           nie zapisywanie nagłówka z wpisem „msgid \"\"”\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           nie zapisywanie nagłówka z wpisem „msgid "
+"\"\"”\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cel konwersji:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
+msgstr ""
+"  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           pominięcie linii „#: plik:linia”\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          zachowanie linii „#: plik:linia” (domyślne)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          zachowanie linii „#: plik:linia” (domyślne)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                zapisanie pliku .po ściśle zgodnego z Uniforum\n"
+msgstr ""
+"      --strict                zapisanie pliku .po ściśle zgodnego z "
+"Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "nie podano nazwy pliku wejściowego"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "wymagany jest dokładnie jeden plik wejściowy"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Składnia: %s [OPCJA] PLIK-WEJŚCIOWY\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1668,22 +1860,22 @@ msgstr ""
 "xgettext). Nie przetłumaczonym wpisom są przypisywane tłumaczenia\n"
 "identyczne z msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  PLIK-WEJŚCIOWY              plik wejściowy PO lub POT\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "brak nazwy polecenia"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Składnia: %s [OPCJA] POLECENIE [OPCJA-POLECENIA]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1698,7 +1890,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1707,49 +1899,50 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Dane dla polecenia:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr ""
 "  --newline                   dodanie znaku nowej linii na końcu danych\n"
 "                                wejściowych\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=PLIK-WEJŚCIOWY  plik wejściowy PO\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "pisanie na standardowe wyjście nie powiodło się"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "brak nazwy filtru"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musi być podany przynajmniej jeden skrypt seda"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Składnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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"
+msgstr ""
+"Zastosowanie filtru na wszystkich tłumaczeniach z katalogu tłumaczeń.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1758,12 +1951,12 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Dane wejściowe i wyjściowe filtra:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1773,120 +1966,130 @@ msgstr ""
 "                                wejściowych i usunięcie z końca danych\n"
 "                                wyjściowych"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, 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"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=PLIK-SKRYPTU     dodanie zawartości PLIKU-SKRYPTU do wykonywanych\n"
+"  -f, --file=PLIK-SKRYPTU     dodanie zawartości PLIKU-SKRYPTU do "
+"wykonywanych\n"
 "                                poleceń\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       nie wypisywanie zawartości wzorca\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             nie używanie sekwencji C na wyjściu (domyślne)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             nie używanie sekwencji C na wyjściu "
+"(domyślne)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                zapisanie pliku w stylu z wcięciami\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, 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"
+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:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "dane z filtra nie są zakończone znakiem nowej linii"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument %s powinien być pojedynczym znakiem przestankowym"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, 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:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "jeżeli są podane %s i %s, nie należy podawać pliku wejściowego"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s wymaga podania \"--template wzorzec\""
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s wymaga podania \"-o plik\""
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s i %s wykluczają się wzajemnie w %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, 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:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "nie można odnaleźć reguł ITS dla %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1894,7 +2097,7 @@ msgstr[0] "%d przetłumaczony komunikat"
 msgstr[1] "%d przetłumaczone komunikaty"
 msgstr[2] "%d przetłumaczonych komunikatów"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1902,7 +2105,7 @@ msgstr[0] ", %d tłumaczenie budzi wątpliwości"
 msgstr[1] ", %d tłumaczenia budzą wątpliwości"
 msgstr[2] ", %d tłumaczeń budzi wątpliwości"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1910,165 +2113,201 @@ msgstr[0] ", %d nie przetłumaczony komunikat"
 msgstr[1] ", %d nie przetłumaczone komunikaty"
 msgstr[2] ", %d nie przetłumaczonych komunikatów"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Generowanie binarnego katalogu komunikatów z tekstowego opisu tłumaczeń.\n"
+msgstr ""
+"Generowanie binarnego katalogu komunikatów z tekstowego opisu tłumaczeń.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nazwa-pliku.po ...          pliki wejściowe\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Tryb działania:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  tryb Javy: generowanie klas Java "
+"ResourceBundle\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  tryb Javy: generowanie klas Java ResourceBundle\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      tryb zasobów C#: generowanie pliku .resources ."
+"NET\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      tryb zasobów C#: generowanie pliku .resources .NET\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   tryb Tcl: generowanie pliku tcl/msgcat .msg\n"
 
 #: src/msgfmt.c:941
 #, 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:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    tryb Qt: generowanie pliku .qm\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               tryb Elementu Pulpitu: generowanie pliku .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               tryb Elementu Pulpitu: generowanie pliku ."
+"desktop\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   tryb XML: generowanie pliku XML\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                włączenie trybu ścisłej zgodności z Uniforum\n"
+msgstr ""
+"      --strict                włączenie trybu ścisłej zgodności z Uniforum\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
+msgstr ""
+"Jeśli plikiem wyjściowym jest -, wynik jest kierowany na standardowe "
+"wyjście.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Javy:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOKALIZACJA    nazwa lokalizacji - język lub język_KRAJ\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOKALIZACJA    nazwa lokalizacji - język lub język_KRAJ\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr "      --source                utworzenie pliku .java zamiast .class\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d KATALOG                  bazowy katalog w hierarchii katalogu klas\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d KATALOG                  bazowy katalog w hierarchii katalogu klas\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 "Nazwa klasy jest określana poprzez dołączenie nazwy lokalizacji do nazwy\n"
-"zasobu, oddzielając je znakiem podkreślenia. Opcja -d jest obowiązkowa. Klasa\n"
+"zasobu, oddzielając je znakiem podkreślenia. Opcja -d jest obowiązkowa. "
+"Klasa\n"
 "jest zapisywana w podanym katalogu.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie C#:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d KATALOG                  katalog bazowy plików .dll zależnych od locale\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d KATALOG                  katalog bazowy plików .dll zależnych od "
+"locale\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, 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 ""
-"Opcje -l i -d są obowiązkowe. Plik .dll jest zapisywany w podkatalogu podanego\n"
+"Opcje -l i -d są obowiązkowe. Plik .dll jest zapisywany w podkatalogu "
+"podanego\n"
 "katalogu, którego nazwa zależy od lokalizacji (locale).\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d KATALOG                  bazowy katalog katalogów komunikatów .msg\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Opcje -l i -d są obowiązkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
+msgstr ""
+"Opcje -l i -d są obowiązkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opcje trybu Elementu Pulpitu (Desktop Entry):\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=WZORZEC          plik .desktop użyty jako WZORZEC\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d KATALOG                  bazowy katalog plików .po\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2077,57 +2316,66 @@ msgstr ""
 "  -kSŁOWO, --keyword=SŁOWO    dodatkowe słowo kluczowe do poszukiwania\n"
 "  -k, --keyword               bez używania domyślnych słów kluczowych\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Opcje -l, -o i --template są obowiązkowe. Jeżeli podana jest opcja -D, pliki\n"
-"wejściowe są szukane w podanym katalogu zamiast pośród argumentów polecenia.\n"
+"Opcje -l, -o i --template są obowiązkowe. Jeżeli podana jest opcja -D, "
+"pliki\n"
+"wejściowe są szukane w podanym katalogu zamiast pośród argumentów "
+"polecenia.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Opcje trybu XML:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAZWA        rozpoznawanie podanego języka XML\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=WZORZEC          plik XML użyty jako WZORZEC\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacja pliku wejściowego:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 wykonanie wszystkich testów włączanych przez\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, 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:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          sprawdzenie obecności i zawartości wpisu nagłówka\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          sprawdzenie obecności i zawartości wpisu "
+"nagłówka\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2136,134 +2384,146 @@ msgstr ""
 "      --check-domain          sprawdzenie konfliktów między dyrektywami\n"
 "                                dotyczącymi domeny i opcją --output-file\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   kontrola czy GNU msgfmt działa jak X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   kontrola czy GNU msgfmt działa jak X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=ZNAK]  sprawdzenie obecności skrótów klawiszowych\n"
+"      --check-accelerators[=ZNAK]  sprawdzenie obecności skrótów "
+"klawiszowych\n"
 "                                dla opcji w menu\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, 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"
+msgstr ""
+"  -f, --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) wpisów\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=LICZBA      wyrównanie napisów do LICZBY bajtów (domyślnie:\n"
+"  -a, --alignment=LICZBA      wyrównanie napisów do LICZBY bajtów "
+"(domyślnie:\n"
 "                              %d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=KOLEJBAJTÓW  zapisanie liczb 32-bitowych w podanej\n"
-"                                kolejności bajtów (big albo little, domyślna\n"
+"                                kolejności bajtów (big albo little, "
+"domyślna\n"
 "                                kolejność zależy od platformy\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               tworzenie pliku binarnego bez tablicy haszującej\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               tworzenie pliku binarnego bez tablicy "
+"haszującej\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            wypisanie statystyk dotyczących tłumaczeń\n"
+msgstr ""
+"      --statistics            wypisanie statystyk dotyczących tłumaczeń\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               zwiększenie ilości podawanych informacji\n"
+msgstr ""
+"  -v, --verbose               zwiększenie ilości podawanych informacji\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, 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:1192
+#: src/msgfmt.c:1187
 #, 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:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "uwaga: nagłówek pliku PO jest niepewny (fuzzy)\n"
-
-#: src/msgfmt.c:1204
-#, 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:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nazwa domeny \"%s\" nie jest odpowiednią nazwa pliku"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, 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"
+msgstr ""
+"nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: użycie przedrostka"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "dyrektywa „domain %s” zignorowana"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "zignorowana pusta wartość „msgstr”"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "zignorowana niepewna (fuzzy) wartość „msgstr”"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, 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/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s istnieje, ale nie może zostać przeczytany"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "błąd w czasie czytania \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "opcja „%c” nie może być użyta przed podaniem „J”, „K”, „T”, „C” lub „X”"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"opcja „%c” nie może być użyta przed podaniem „J”, „K”, „T”, „C” lub „X”"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2272,7 +2532,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2347,32 +2607,42 @@ msgstr ""
 "  -v, --invert-match          wypisanie tylko komunikatów, które nie pasują do\n"
 "                              kryteriów wyboru\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                używanie sekwencji C, bez znaków rozszerzonych\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                używanie sekwencji C, bez znaków "
+"rozszerzonych\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generowanie posortowanego wyjścia\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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:298
+msgstr ""
+"      --sort-by-file          sortowanie wyjścia według położenia pliku\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Aktualne środowisko jest obojętne językowo. Proszę ustawić zmienną\n"
 "środowiskową LANG zgodnie z opisem w pliku ABOUT-NLS. Jest to\n"
 "niezbędne do testowania tłumaczeń.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2383,12 +2653,12 @@ msgstr ""
 "Proszę podać lokalizację za pomocą opcji --locale lub plik\n"
 "wyjściowy .po za pomocą opcji --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Utworzono %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2397,26 +2667,28 @@ msgstr ""
 "Stworzenie nowego pliku PO, inicjalizując meta-informacje wartościami ze\n"
 "środowiska użytkownika.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input-PLIK-WEJŚCIOWY  plik wejściowy POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Jeśli nie podano pliku wejściowego, plik POT jest szukany w bieżącym katalogu.\n"
+"Jeśli nie podano pliku wejściowego, plik POT jest szukany w bieżącym "
+"katalogu.\n"
 "Jeśli plik to -, czytane jest standardowe wejście.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2426,17 +2698,21 @@ msgstr ""
 "ustawień lokalizacji użytkownika. Jeśli plik to -, wyniki są wypisywane na\n"
 "standardowym wyjściu.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=JJ_KK          ustawienie docelowej lokalizacji\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         uznanie, że plik PO jest generowany automatycznie\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         uznanie, że plik PO jest generowany "
+"automatycznie\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2444,12 +2720,12 @@ msgstr ""
 "Znaleziono więcej niż jeden plik .pot.\n"
 "Proszę podać plik .pot za pomocą opcji --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "błąd podczas czytania bieżącego katalogu"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2457,64 +2733,73 @@ msgstr ""
 "Nie znaleziono pliku .pot w katalogu bieżącym.\n"
 "Proszę podać plik .pot za pomocą opcji --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zawiódł z kodem wyjścia %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Nowy katalog komunikatów powinien zawierać adres e-mail tłumacza, tak żeby\n"
-"użytkownicy mogli wysyłać komentarze dotyczące tłumaczeń i prowadzący projekty\n"
+"użytkownicy mogli wysyłać komentarze dotyczące tłumaczeń i prowadzący "
+"projekty\n"
 "mogli kontaktować się w przypadku niespodziewanych problemów technicznych.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Polskie tłumaczenia dla pakietu %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:204
+#: 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"
+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:208
+#: 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 "domena \"%s\" w pliku wejściowym „%s” nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domena \"%s\" w pliku wejściowym „%s” nie zawiera wpisu nagłówka ze "
+"specyfikacją zestawu znaków"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "uwaga: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2523,10 +2808,11 @@ 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:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2534,7 +2820,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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2548,7 +2834,7 @@ msgstr ""
 "w ASCII albo upewnij się, że są od początku, już w plikach źródłowych,\n"
 "zakodowane w UTF-8.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2561,12 +2847,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:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2577,7 +2863,7 @@ msgstr ""
 "  potem 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:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2590,7 +2876,7 @@ msgstr ""
 "  potem 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:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2608,19 +2894,26 @@ msgstr "wyrażenie do wyliczania liczby mnogiej może zwrócić wartości ujemne
 #: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu, ale wyrażenie do wyliczania liczby mnogiej może zwrócić "
+"wartości do %lu"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
-msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować dzielenie przez zero"
+msgstr ""
+"wyrażenie do wyliczania liczby mnogiej może spowodować dzielenie przez zero"
 
 #: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować przepełnienie"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować wyjątki, możliwe dzielenie przez zero"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"wyrażenie do wyliczania liczby mnogiej może spowodować wyjątki, możliwe "
+"dzielenie przez zero"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2669,10 +2962,14 @@ msgstr[1] "ale niektóre komunikaty mają %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty mają %lu form mnogich"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "katalog komunikatów zawiera tłumaczenia form mnogich, ale brakuje wpisu nagłówka z \"Plural-Forms: nplurals=LICZBA; plural=WYRAŻENIE;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+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:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "linie „msgid” i „msgid_plural” nie zaczynają się obie od „\\n”`"
 
@@ -2681,11 +2978,11 @@ msgstr "linie „msgid” i „msgid_plural” nie zaczynają się obie od „\\
 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:638
+#: src/msgl-check.c:639
 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:656
+#: src/msgl-check.c:657
 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”"
 
@@ -2694,11 +2991,11 @@ msgstr "linie „msgid” i „msgid_plural” nie kończą się obie na „\\n�
 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:679
+#: src/msgl-check.c:680
 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:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
 
@@ -2728,17 +3025,19 @@ msgstr "Wielokropek ASCII („...”) zamiast znaku Unicode"
 
 #: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr "odstęp przez wielokropkiem znaleziony pośród napisów widocznych dla użytkownika"
+msgstr ""
+"odstęp przez wielokropkiem znaleziony pośród napisów widocznych dla "
+"użytkownika"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Podwójny cudzysłów ASCII użyty zamiast znaku Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Pojedynczy cudzysłów ASCII użyty zamiast znaku Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "Punktor ASCII („%c”) zamiast znaku Unicode"
@@ -2753,37 +3052,50 @@ msgstr "%s: dane wejściowe są błędne jeżeli kodowanie to \"%s\""
 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:290
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"plik wejściowy nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(), a iconv() nie obsługuje tej konwersji."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+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:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre różniące się msgid stają się identyczne."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre różniące się "
+"msgid stają się identyczne."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(). Ta wersja została zbudowana bez iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(). Ta "
+"wersja została zbudowana bez iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s jest prawidłowe tylko z %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "typ zapasowy"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2805,17 +3117,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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      tłumaczenia odnoszące się do starych źródeł\n"
+msgstr ""
+"  def.po                      tłumaczenia odnoszące się do starych źródeł\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odniesienia do nowych źródeł\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2824,7 +3137,7 @@ msgstr ""
 "  -C, --compendium=PLIK       dodatkowa biblioteka tłumaczeń komunikatów,\n"
 "                                może być podana więcej niż raz\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2833,146 +3146,178 @@ msgstr ""
 "  -U, --update                uaktualnienie def.po, nie wykonywanie\n"
 "                                niczego jeśli def.po jest już aktualny\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie uaktualniania:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROLA       utworzenie kopii zapasowej def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, 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"
+msgstr ""
+"      --suffix=KOŃCÓWKA       zmiana domyślnej końcówki kopii zapasowej\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Metoda kontroli wersji może być wybrana za pomocą opcji --backup lub zmiennej\n"
+"Metoda kontroli wersji może być wybrana za pomocą opcji --backup lub "
+"zmiennej\n"
 "środowiskowej VERSION_CONTROL. Wartości to:\n"
-"  none, off       nie tworzenie kopii zapasowych (nawet jeśli podano --backup)\n"
+"  none, off       nie tworzenie kopii zapasowych (nawet jeśli podano --"
+"backup)\n"
 "  numbered, t     tworzenie numerowanych kopii zapasowych\n"
 "  existing, nil   numerowanie jeśli istnieją numerowane, proste jeśli nie\n"
 "  simple, never   tworzenie zawsze prostych kopii zapasowych\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Końcówka nazwy kopii zapasowej to „~”, o ile nie ustawiono przez --suffix\n"
 "lub zmienną środowiskową SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              zachowanie poprzednich identyfikatorów\n"
 "                                przetłumaczonych komunikatów\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       pominięcie znaczników postępu\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ten komunikat powinien definiować formy mnogie"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ten komunikat nie powinien definiować form mnogich"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sPrzeczytane %ld starych + %ld odnośników, %ld dołączonych, %ld niedokładnych, %ld brakujących, %ld przestarzałych.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sPrzeczytane %ld starych + %ld odnośników, %ld dołączonych, %ld "
+"niedokładnych, %ld brakujących, %ld przestarzałych.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " zrobione.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Składnia: %s [OPCJA] [PLIK]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Przekonwertowanie binarnego katalogu komunikatów na plik .po w stylu "
+"Uniforum.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  tryb Javy: wejście jest klasą Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  tryb Javy: wejście jest klasą Java "
+"ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      tryb zasobów C#: na wejściu plik .resources .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      tryb zasobów C#: na wejściu plik .resources ."
+"NET\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   tryb Tcl: wejście jest plikiem tcl/msgcat .msg\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   tryb Tcl: wejście jest plikiem tcl/msgcat ."
+"msg\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  PLIK ...                    pliki wejściowe .mo\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Nazwa klasy jest określana poprzez dołączenie nazwy lokalizacji do nazwy\n"
-"zasobu, rozdzielając je znakiem podkreślenia. Klasa jest szukana przy użyciu\n"
+"zasobu, rozdzielając je znakiem podkreślenia. Klasa jest szukana przy "
+"użyciu\n"
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2981,29 +3326,31 @@ msgstr ""
 "Opcje -l i -d są obowiązkowe. Plik .dll znajduje się w podkatalogu podanego\n"
 "katalogu, którego nazwa zależy od lokalizacji (locale).\n"
 
-#: src/msgunfmt.c:480
+#: 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:486
+#: 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 "Opcje -l i -d są obowiązkowe. Plik .msg jest szukany w podanym katalogu.\n"
+msgstr ""
+"Opcje -l i -d są obowiązkowe. Plik .msg jest szukany w podanym katalogu.\n"
 
-#: src/msgunfmt.c:512
+#: 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:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                zapisanie pliku ściśle zgodnego z Uniforum\n"
+msgstr ""
+"      --strict                zapisanie pliku ściśle zgodnego z Uniforum\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3025,17 +3372,20 @@ msgstr ""
 "w plikach zostaną zgromadzone. W przypadku użycia opcji --unique, duplikaty\n"
 "zostaną usunięte.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              wypisanie tylko duplikatów\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                wypisanie tylko unikalnych, bez duplikatów\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                wypisanie tylko unikalnych, bez duplikatów\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3096,27 +3446,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "niekonsekwentne użycie #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "brak części „msgstr[]”"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "brak części „msgstr_plural”"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "brak części „msgstr”"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "pierwsza forma mnoga ma niezerowy indeks"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma mnoga ma zły indeks"
@@ -3126,7 +3476,7 @@ msgstr "forma mnoga ma zły indeks"
 msgid "too many errors, aborting"
 msgstr "za dużo błędów, przerwanie wykonywania"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "błędna sekwencja wielobajtowa"
@@ -3136,41 +3486,41 @@ msgstr "błędna sekwencja wielobajtowa"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "niekompletna sekwencja wielobajtowa na końcu pliku"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "niekompletna sekwencja wielobajtowa na końcu linii"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv zawiódł"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nieznane słowo kluczowe \"%s\""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "błędna sekwencja sterująca"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "znak końca pliku wewnątrz napisu"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "znak końca wiersza wewnątrz napisu"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separator kontekstu <EOT> wewnątrz napisu"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ten plik nie może zawierać dyrektyw domain"
@@ -3200,7 +3550,7 @@ msgstr "brak „=” po „%s”"
 msgid "invalid non-blank line"
 msgstr "błędna niepusta linia"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "plik \"%s\" jest obcięty"
@@ -3210,29 +3560,45 @@ msgstr "plik \"%s\" jest obcięty"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "plik \"%s\" zawiera napis, który nie jest zakończony znakiem NUL"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "plik \"%s\" zawiera napis, który nie jest zakończony znakiem NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "plik \"%s\" nie jest w formacie .mo GNU"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "plik \"%s\" zawiera napis nie zakończony znakiem NUL pod %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "uwaga: błędna składnia znaku Unicode: \\uxxxx"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: uwaga: niezakończony napis U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "uwaga: błędny znak unikodowy"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "uwaga: nie zakończony napis"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "uwaga: błąd składniowy"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "uwaga: nie zakończona para klucz/wartość"
 
@@ -3240,11 +3606,11 @@ msgstr "uwaga: nie zakończona para klucz/wartość"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "uwaga: błąd składniowy, oczekiwano „;” po napisie"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "uwaga: błąd składniowy, oczekiwano „=” albo „;” po napisie"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Program napisany przez %s i %s.\n"
@@ -3253,16 +3619,16 @@ msgstr "Program napisany przez %s i %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegana"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Przekodowanie serbskiego tekstu z cyrylicy na alfabet łaciński.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3271,27 +3637,27 @@ msgstr ""
 "Tekst wejściowy jest czytany ze standardowego wejścia. Tekst przekształcony\n"
 "jest wysyłany do standardowego wyjścia.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "dane wejściowe są błędne jeżeli kodowanie to \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "błąd w czasie zmiany kodowania z \"%s\" na \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "oczekiwano dwóch argumentów"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Składnia: %s [OPCJA] URL PLIK\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3300,111 +3666,134 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "błąd czytania \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "błąd podczas pisania na standardowe wyjście"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "błąd po przeczytaniu \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Ściąganie %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " czas minął.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " niepowodzenie.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Nie można zapisać wielu domen tłumaczeń do jednego pliku o podanym formacie wyjściowym. Można to zrobić używając pliku o składni PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Nie można zapisać wielu domen tłumaczeń do jednego pliku o podanym formacie "
+"wyjściowym. Można to zrobić używając pliku o składni PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "W podanym formacie wyjściowym nie można zapisać wielu domen tłumaczenia w pojedynczym pliku."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"W podanym formacie wyjściowym nie można zapisać wielu domen tłumaczenia w "
+"pojedynczym pliku."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "katalog komunikatów ma tłumaczenia zależne od kontekstu, ale nie mogą być zapisane w podanym formacie wyjściowym."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"katalog komunikatów ma tłumaczenia zależne od kontekstu, ale nie mogą być "
+"zapisane w podanym formacie wyjściowym."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "katalog komunikatów ma tłumaczenia form mnogich, ale format wyjściowy tego nie obsługuje. Można wygenerować klasę Javy przy użyciu \"msgfmt --java\" zamiast pliku properties."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"katalog komunikatów ma tłumaczenia form mnogich, ale format wyjściowy tego "
+"nie obsługuje. Można wygenerować klasę Javy przy użyciu \"msgfmt --java\" "
+"zamiast pliku properties."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "katalog komunikatów ma formy mnogie, ale nie mogą być zapisane na wyjściu."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"katalog komunikatów ma formy mnogie, ale nie mogą być zapisane na wyjściu."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie można utworzyć pliku wyjściowego \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standardowe wyjście"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "nie udało się utworzyć katalogu \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, 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:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilacja klasy C# nie udała się"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "błąd otwarcia \"%s\" do pisania"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "niepoprawna nazwa klasy Javy: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"kompilacja klasy Javy nie udała się, proszę użyć --verbose lub ustawić $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "niekompletna sekwencja wielobajtowa"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji „\\%c”"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3417,7 +3806,7 @@ msgstr ""
 "innego niż ty. Rozważ używanie w nazwach msgctxt wyłącznie znaków ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3440,7 +3829,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3458,12 +3848,12 @@ msgstr ""
 "a katalog komunikatów Qt rozumie tylko Unicode w przetłumaczonych\n"
 "napisach, nie rozumie go w nie przetłumaczonych\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "błąd podczas pisania do podprocesu %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3471,7 +3861,7 @@ msgstr ""
 "katalog komunikatów ma tłumaczenia zależne od kontekstu,\n"
 "ale format .resources języka C# nie pozwala używać kontekstów\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3479,7 +3869,7 @@ msgstr ""
 "katalog komunikatów ma formy mnogie,\n"
 "ale format .resources języka C# nie pozwala ich używać\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3487,7 +3877,7 @@ msgstr ""
 "katalog komunikatów zawiera tłumaczenia zależne od kontekstu,\n"
 "ale format katalogu komunikatów Tcl-a nie pozwala używać kontekstów\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3495,36 +3885,56 @@ 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:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uwaga: nie zakończony napis"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uwaga: nie zakończone wyrażenie regularne"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "uwaga: błędny znak unikodowy"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: uwaga: błędny znak unikodowy"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uwaga: niezakończona stała znakowa"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Proszę podać kodowanie źródła przy pomocy --from-code ."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3533,7 +3943,7 @@ msgstr ""
 "%s:%d: Błędna sekwencja wielobajtowa.\n"
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3542,7 +3952,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:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3551,7 +3961,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:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3560,12 +3970,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:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: błąd iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3574,119 +3984,141 @@ 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:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: uwaga: błędny znak unikodowy"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uwaga: niezakończona stała znakowa"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uwaga: znaleziono „)”, oczekiwano „}”"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uwaga: znaleziono „}”, oczekiwano „)”"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "„%s” nie jest prawidłową nazwą kodowania. W zastępstwie użyję ASCII.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "symbol „%s” nie rozpoznany przez sprawdzaniu składni"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "nieznany koniec zdania typu „%s”"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, 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:719
+#: src/xgettext.c:705
 #, 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:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "uwaga: nie istnieje plik reguł ITS „%s”"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "uwaga: nie istnieje plik reguł ITS „%s; sprawdź swoją instalację programu gettext”"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"uwaga: nie istnieje plik reguł ITS „%s; sprawdź swoją instalację programu "
+"gettext”"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, 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:1040
+#: src/xgettext.c:1027
 #, 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"
+msgstr ""
+"Wyciągnięcie przetłumaczalnych napisów z podanych plików wejściowych.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAZWA  użycie NAZWA.po (nie messages.po) dla wyjścia\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NAZWA  użycie NAZWA.po (nie messages.po) dla wyjścia\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, 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:1067
+#: src/xgettext.c:1054
 #, 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"
+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:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wybór języka pliku wejściowego:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAZWA        rozpoznawanie podanego języka\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Domyślnie język jest zgadywany na podstawie rozszerzenia pliku wejściowego.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Domyślnie język jest zgadywany na podstawie rozszerzenia pliku wejściowego.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3695,37 +4127,43 @@ msgstr ""
 "      --from-code=NAZWA       kodowanie plików wejściowych\n"
 "                                (oprócz Pythona, Tcl-a, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, 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:1096
+#: src/xgettext.c:1083
 #, 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"
+msgstr ""
+"  -j, --join-existing         dołączenie komunikatów do istniejącego pliku\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, 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:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cZNACZNIK, --add-comments=ZNACZNIK  w pliku wyjściowym będą umieszczone\n"
-"                                bloki komentarzy zaczynające się od ZNACZNIKA\n"
-"                                i poprzedzające je linie ze słowami kluczowymi\n"
-"  -c, --add-comments[=ZNACZNIK]  umieszczenie bloków komentarza ze ZNACZNIKIEM\n"
-"                                (lub poprzedzających linie ze słowem kluczowym)\n"
+"                                bloki komentarzy zaczynające się od "
+"ZNACZNIKA\n"
+"                                i poprzedzające je linie ze słowami "
+"kluczowymi\n"
+"  -c, --add-comments[=ZNACZNIK]  umieszczenie bloków komentarza ze "
+"ZNACZNIKIEM\n"
+"                                (lub poprzedzających linie ze słowem "
+"kluczowym)\n"
 "                                w pliku wyjściowym\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3738,7 +4176,7 @@ msgstr ""
 "                                 Unicode: wielokropki, sekwencje\n"
 "                                 odstęp-wielokropek, cudzysłowy, punktory\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3746,252 +4184,201 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 "      --sentence-end=TYP      typ końca zdania (domyślnie: single-space -\n"
-"                                pojedynczy odstęp albo double-space - podwójny\n"
+"                                pojedynczy odstęp albo double-space - "
+"podwójny\n"
 "                                odstęp)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcje specyficzne dla języka:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           wyciągnięcie wszystkich napisów\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (tylko języki C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (tylko języki C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=SŁOWO:ARG:FLAGA  dodatkowa flaga napisu wewnątrz argumentu numer\n"
+"      --flag=SŁOWO:ARG:FLAGA  dodatkowa flaga napisu wewnątrz argumentu "
+"numer\n"
 "                              ARG słowa kluczowego SŁOWO\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (tylko języki C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, 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"
+msgstr ""
+"  -T, --trigraphs             przetwarzanie na wejściu trójznaków ANSI C\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (tylko języki C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "--its=FILE                    zastosowanie reguł ITS z PLIKU\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (tylko języki oparte na XML-u)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozpoznawanie napisów w formacie Qt\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (tylko język C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozpoznawanie napisów w formacie KDE 4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 więcej szczegółów o rozpoznawaniu formatów\n"
 "                              napisów\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               wypisanie komentarzy itstool\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=NAPIS    wypisanie właściciela praw autorskich\n"
+msgstr ""
+"      --copyright-holder=NAPIS    wypisanie właściciela praw autorskich\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user          pominięcie na wyjściu informacji o prawach FSF dla\n"
+"      --foreign-user          pominięcie na wyjściu informacji o prawach FSF "
+"dla\n"
 "                                zewnętrznych projektów\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, 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:1207
+#: src/xgettext.c:1194
 #, 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:1209
+#: src/xgettext.c:1196
 #, 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"
+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:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -m[NAPIS], --msgstr-prefix[=NAPIS]    użycie NAPISU lub \"\" jako\n"
 "                                przedrostka wpisów msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[NAPIS], --msgstr-suffix[=NAPIS]    użycie NAPISU lub \"\" jako przyrostka\n"
+"  -M[NAPIS], --msgstr-suffix[=NAPIS]    użycie NAPISU lub \"\" jako "
+"przyrostka\n"
 "                                wpisów msgstr\n"
 
-#: src/xgettext.c:2040
-#, c-format
-msgid "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:2165
-msgid "standard input"
-msgstr "standardowe wejście"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Znak nie-ASCII w %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Komentarz ze znakami nie-ASCII przy albo przez %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Napis nie-ASCII przy %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: uwaga: "
-
-#: src/xgettext.c:2448
+#: src/xgettext.c:1597
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-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:2449
-#, c-format
-msgid "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:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"Łańcuch formatu „%s” z nienazwanymi argumentami nie może być poprawnie przetłumaczony:\n"
-"Tłumacz nie może uporządkować argumentów.\n"
-"Rozważ użycie formatu z nazwami argumentów i mapowania zamiast\n"
-"zestawu argumentów.\n"
-
-#: src/xgettext.c:2545
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Pusty msgid. Jest on zarezerwowany dla gettexta GNU:\n"
-"gettext(\"\") zwraca wpis nagłówka z meta-informacjami,\n"
-"a nie pusty napis.\n"
+"Argument opcji --flag nie ma składni <keyword>:<argnum>:[pass-]<flag>: %s"
 
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego „%.*s”"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "uwaga: brak kontekstu słowa kluczowego „%.*s”"
-
-#: src/xgettext.c:3334
-#, 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:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "pomieszanie kontekstów między formą pojedynczą i mnogą"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "standardowe wejście"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4003,21 +4390,16 @@ msgstr ""
 "zmienną MSGID_BUGS_ADDRESS; w przeciwnym wypadku proszę\n"
 "podać opcję --msgid-bugs-address z linii poleceń.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "nieznany język „%s”"
 
-#: 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-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Proszę podać kodowanie źródła przy pomocy --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4026,7 +4408,7 @@ msgstr ""
 "%s:%d: Błędna sekwencja wielobajtowa.\n"
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4035,7 +4417,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-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4044,7 +4426,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-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4053,7 +4435,7 @@ 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-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4062,145 +4444,200 @@ msgstr ""
 "%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
 "Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa RegExp"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: uwaga: %s nie jest dozwolone"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: uwaga: niezakończony element składniowy XML"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: błędna interpolacja zmiennej w \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 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:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Błędna sekwencja wielobajtowa.\n"
 "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:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Niekompletna długa sekwencja wielobajtowa.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code albo przez\n"
+"Proszę podać prawidłowe 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:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Niekompletna sekwencja wielobajtowa na końcu pliku.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code albo przez\n"
+"Proszę podać prawidłowe 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:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Niekompletna sekwencja wielobajtowa na końcu linii.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code albo przez\n"
+"Proszę podać prawidłowe 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:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
-"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code albo przez\n"
+"Proszę podać prawidłowe 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:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Nieznane kodowanie \"%s\". Użyte będzie kodowanie ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: błędna definicja napisu"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: brakująca liczba po #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: błędne wyrażenie napisowe"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: błędna definicja napisu"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: błędna definicja napisu"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: uwaga: składnia $\"...\" nie jest używana ze względu na bezpieczeństwo; użyj eval_gettext"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: uwaga: składnia $\"...\" nie jest używana ze względu na "
+"bezpieczeństwo; użyj eval_gettext"
+
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa wyrażenia regularnego"
@@ -4330,3 +4767,102 @@ msgstr "wewnątrz komentarza albo przetwarzający instrukcję"
 #, c-format
 msgid "document ended unexpectedly: %s"
 msgstr "tekst nieoczekiwanie się zakończył: %s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja „--%s” nie może mieć argumentu\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: nierozpoznana opcja „--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: opcja „-W %s” wymaga argumentu\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "uwaga: nagłówek pliku PO jest niepewny (fuzzy)\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Znak nie-ASCII w %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Komentarz ze znakami nie-ASCII przy albo przez %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Napis nie-ASCII przy %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: uwaga: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Chociaż %s jest użyte w formacie położenia napisu, %s nie jest "
+#~ "prawidłowym formatem. Powód: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Łańcuch formatu „%s” z nienazwanymi argumentami nie może być poprawnie "
+#~ "przetłumaczony:\n"
+#~ "Tłumacz nie może uporządkować argumentów.\n"
+#~ "Rozważ użycie formatu z nazwami argumentów i mapowania zamiast\n"
+#~ "zestawu argumentów.\n"
+
+#~ 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 ""
+#~ "Pusty msgid. Jest on zarezerwowany dla gettexta GNU:\n"
+#~ "gettext(\"\") zwraca wpis nagłówka z meta-informacjami,\n"
+#~ "a nie pusty napis.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego „%.*s”"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "uwaga: brak kontekstu słowa kluczowego „%.*s”"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego „%.*s”"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "pomieszanie kontekstów między formą pojedynczą i mnogą"
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index a302a3580..75b84d691 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -1,853 +1,5299 @@
 # Portuguese translation of the "gettext" messages
 # Copyright (C) 1996 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018
 # Nuno Oliveira <nuno@eq.uc.pt>, 1996.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 0.10.23\n"
-"POT-Creation-Date: 1998-04-30 22:50-0700\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"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-10-08 13:54+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
+"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: lib/error.c:103
-msgid "Unknown system error"
-msgstr "Erro desconhecido do sistema"
+#: gnulib-lib/argmatch.c:134
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "argumento inválido %s para %s"
+
+#: gnulib-lib/argmatch.c:135
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argumento ambíguo %s para %s"
+
+#: gnulib-lib/argmatch.c:154
+msgid "Valid arguments are:"
+msgstr "Os argumentos válidos são:"
+
+#: gnulib-lib/clean-temp.c:325
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "impossível encontrar uma pasta temporária, tente definir $TMPDIR"
 
-#: lib/getopt.c:680
+#: gnulib-lib/clean-temp.c:339
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: a op��o `%s' � amb�gua\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "impossível criar uma pasta temporária usando o modelo \"%s\""
 
-#: lib/getopt.c:704
+#: gnulib-lib/clean-temp.c:435
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: a op��o `--%s' n�o permite um argumento\n"
+msgid "cannot remove temporary file %s"
+msgstr "impossível remover o ficheiro temporário %s"
 
-#: lib/getopt.c:709
+#: gnulib-lib/clean-temp.c:450
 #, 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"
+msgid "cannot remove temporary directory %s"
+msgstr "impossível remover a pasta temporária %s"
 
-#: lib/getopt.c:726 lib/getopt.c:899
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr "erro de escrita"
+
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
+#, c-format
+msgid "preserving permissions for %s"
+msgstr "preservar permissões para %s"
+
+#: gnulib-lib/copy-file.c:175
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: a op��o `%s' requere um argumento\n"
+msgid "error while opening %s for reading"
+msgstr "erro ao abrir %s para leitura"
 
-#. --option
-#: lib/getopt.c:755
+#: gnulib-lib/copy-file.c:179
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op��o n�o reconhecida `--%s'\n"
+msgid "cannot open backup file %s for writing"
+msgstr "impossível abrir a segurança %s para escrita"
 
-#. +option or -option
-#: lib/getopt.c:759
+#: gnulib-lib/copy-file.c:183
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op��o n�o reconhecida `%c%s'\n"
+msgid "error reading %s"
+msgstr "erro ao ler %s"
 
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: gnulib-lib/copy-file.c:187
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: op��o ilegal -- %c\n"
+msgid "error writing %s"
+msgstr "erro ao escrever %s"
 
-#: lib/getopt.c:788
+#: gnulib-lib/copy-file.c:191
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: op��o ilegal -- %c\n"
+msgid "error after reading %s"
+msgstr "erro após ler %s"
 
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: op��o requere um argumento -- %c\n"
+msgid "fdopen() failed"
+msgstr "fdopen() falhou"
 
-#: lib/getopt.c:865
+#: gnulib-lib/csharpcomp.c:443
 #, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: a op��o `%s' � amb�gua\n"
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
+msgstr "Compilador C# não encontrado, tente instalar pnet"
 
-#: lib/getopt.c:883
+#: gnulib-lib/csharpexec.c:255
 #, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: a op��o `--%s' n�o permite um argumento\n"
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
+msgstr "Máquina virtual C# não encontrada, tente instalar pnet"
 
-#: lib/xmalloc.c:82
-#, fuzzy
-msgid "Memory exhausted"
-msgstr "mem�ria exausta"
+#: gnulib-lib/error.c:195
+msgid "Unknown system error"
+msgstr "Erro de sistema desconhecido"
+
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
+#, c-format
+msgid "%s subprocess failed"
+msgstr "sub-processo %s falhou"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a opção \"%s\" é ambígua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opção não reconhecida \"%c%s\"\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: opção \"%c%s\" não permite argumentos\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: opção \"--%s\" requer um argumento\n"
+
+#: gnulib-lib/getopt.c:621
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opção inválida -- \"%c\"\n"
+
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: a opção requer um argumento -- \"%c\"\n"
+
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "argumento source_version inválido para compile_java_class"
+
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "argumento target_version inválido para compile_java_class"
+
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "falha ao criar \"%s\""
+
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "erro ao escrever o ficheiro \"%s\""
+
+#: gnulib-lib/javacomp.c:2436
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Compilador Java não encontrado, tente instalar gcj ou defina $JAVAC"
+
+#: gnulib-lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr ""
+"Máquina virtual Java não encontrada, tente instalar gij ou defina $JAVA"
+
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "erro E/S no sub-processo %s"
+
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#, c-format
+msgid "memory exhausted"
+msgstr "Memória esgotada"
+
+#: gnulib-lib/pipe-filter-ii.c:313
+#, c-format
+msgid "creation of threads failed"
+msgstr "falha ao criar tópicos"
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "falha ao escrever no sub-processo %s"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "falha ao ler do sub-processo %s"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "impossível preparar E/S não bloqueadora para o sub-processo %s"
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "falha ao comunicar com o sub-processo %s"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "sub-processo %s terminou com código de saída %d"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#.
+#. If you don't know what to put here, please see
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: gnulib-lib/quotearg.c:362
+msgid "`"
+msgstr "\""
+
+#: gnulib-lib/quotearg.c:363
+msgid "'"
+msgstr "\""
+
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr "definir permissões para %s"
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "impossível criar túnel"
+
+#: gnulib-lib/w32spawn.h:49
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle falhou"
+
+#: gnulib-lib/w32spawn.h:90
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "impossível restaurar fd %d: dup2 falhou"
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
+#, c-format
+msgid "%s subprocess"
+msgstr "sub-processo %s"
+
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "sub-processo %s obteve sinal fatal %d"
+
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr "O elemento raiz deve ser <%s>"
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "O elemento <%s> não contém um elemento <%s>"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr "O elemento <%s> não tem atributo <%s>"
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente \"%s --help\" para mais informação.\n"
 
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:254 src/msgunfmt.c:175 src/xgettext.c:394
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Uso: %s [OPÇÃO...] [IDIOMA REGRAS]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+"Extrair ou converter regras de plural Unicode CLDR.\n"
+"\n"
+"Se IDIOMA e REGRAS forem ambos especificados, lê regras de plural CLDR para \n"
+"IDIOMA de REGRAS e imprime-as de forma adequada para uso gettext. Se não\n"
+"houver argumentos, lê as regras de plural da entrada padrão\n"
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr "Argumentos obrigatórios ou opcionais para opções longas são igualmente obrigatórios ou opcionais para opções curtas correspondentes\n"
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+"  -c, --cldr                  mostra regras de plural em formato CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  mostra esta mensagem e sai\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               mostra informação de versão e sai\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Reportar erros a <bug-gnu-gettext@gnu.org>.\n"
+"Reportar erros de tradução a <translation-team-pt@lists.sourceforge.net>\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
+"Este software é grátis: pode alterá-lo e redistribuí-lo.\n"
+"Não há QUALQUER GARANTIA, até ao limite da Lei.\n"
 
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:259 src/msgunfmt.c:180 src/xgettext.c:399
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
+msgstr "Escrito por %s\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr "Daiki Ueno"
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr "impossível ler \"%s\""
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr "impossível extrair regras para %s"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr "impossível analisar regra CLDR"
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr "operando extra %s"
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "erro ao abrir \"%s\" para leitura"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgstr ""
+"uma especificação de formato para o argumento %u, como em \"%s\", não existe "
+"em \"%s\""
+
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "uma especificação de formato para o argumento %u não existe em \"%s\""
+
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
+msgstr ""
+"as especificações de formato \"%s\" e \"%s\" para o argumento %u não são as "
+"mesmas"
+
+#: src/format-boost.c:449
+#, c-format
+msgid "The directive number %u starts with | but does not end with |."
+msgstr "A directiva número %u começa com | mas não termina com |."
+
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"\"%s\" não é uma cadeia de formato %s válida, ao contrário de \"%s\". "
+"Motivo: %s"
+
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Na directiva nº %u, o símbolo após \"<\" não é o nome de uma macro "
+"especificadora de formato. Os nomes válidos de macros estão listados em ISO "
+"C 99, secção 7.8.1."
+
+#: src/format-c.c:39
+#, c-format
+msgid "In the directive number %u, the token after '<' is not followed by '>'."
+msgstr "Na directiva número %u, o símbolo após \"<\" não é seguido de \">\"."
+
+#: src/format-c.c:42 src/format-gfc-internal.c:289
+#, c-format
+msgid "The string refers to argument number %u but ignores argument number %u."
+msgstr "A cadeia refere o argumento nº %u mas ignora o argumento nº %u"
+
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
+msgstr "o número de especificações de formato em \"%s\" e \"%s\" não coincide"
+
+#: src/format-csharp.c:85 src/format-java.c:205
+#, c-format
+msgid "In the directive number %u, '{' is not followed by an argument number."
+msgstr "Na directiva nº %u, \"{\" não é seguida de um número de argumento."
+
+#: src/format-csharp.c:106
+#, c-format
+msgid "In the directive number %u, ',' is not followed by a number."
+msgstr "Na directiva número %u, \",\" não é seguida de um número."
+
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"A cadeia termina no meio de uma directiva: encontrada \"{\" sem \"}\" "
+"correspondente."
+
+#: src/format-csharp.c:136
+#, c-format
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"A directiva nº %u termina com um carácter inválido \"%c\", em vez de \"}\"."
+
+#: src/format-csharp.c:137
+#, c-format
+msgid "The directive number %u ends with an invalid character instead of '}'."
+msgstr "A directiva nº %u termina com um carácter inválido em vez de \"}\"."
+
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"A cadeia começa no meio de uma directiva: encontrada \"}\" sem \"{\" "
+"correspondente."
+
+#: src/format-csharp.c:159
+#, c-format
+msgid "The string contains a lone '}' after directive number %u."
+msgstr "A cadeia contém uma \"}\" sozinha após a directiva nº %u"
+
+#: src/format-gcc-internal.c:255
+#, c-format
+msgid "In the directive number %u, the flags combination is invalid."
+msgstr "Na directiva número %u, a combinação de bandeiras é inválida."
+
+#: src/format-gcc-internal.c:292
+#, c-format
+msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgstr "Na directiva número %u, não é permitida precisão antes de \"%c\"."
+
+#: 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 ""
+"Na directiva número %u, o número do argumento para a precisão tem de ser "
+"igual a %u."
+
+#: src/format-gcc-internal.c:398
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Na directiva número %u, não é permitida uma especificação de precisão antes "
+"de \"%c\"."
+
+#: src/format-gcc-internal.c:406
+#, c-format
+msgid "In the directive number %u, the precision specification is invalid."
+msgstr "Na directiva número %u, a especificação de precisão é inválida."
+
+#: src/format-gcc-internal.c:463
+#, c-format
+msgid "In the directive number %u, flags are not allowed before '%c'."
+msgstr "Na directiva número %u, não são permitidas bandeiras antes de \"%c\"."
+
+#: src/format-gcc-internal.c:677
+#, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr "\"%s\" usa %%m mas \"%s\" não"
+
+#: src/format-gcc-internal.c:680
+#, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr "\"%s\" não usa %%m mas \"%s\" usa %%m"
+
+#: src/format-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "\"%s\" usa %%C mas \"%s\" não"
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr "\"%s\" não usa %%C mas \"%s\" usa %%C"
+
+#: src/format-invalid.h:22
+msgid "The string ends in the middle of a directive."
+msgstr "A cadeia acaba no meio de uma directiva."
+
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr ""
+"A cadeia refere argumentos tanto através de números de argumento absolutos "
+"como através de especificações de argumento não numeradas."
 
-#: src/gettextp.c:154
-msgid "missing arguments"
-msgstr "argumentos insuficientes"
+#: src/format-invalid.h:28
+#, c-format
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"Na directiva número %u, o argumento número 0 não é um inteiro positivo."
+
+#: src/format-invalid.h:30
+#, c-format
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Na directiva número %u, o argumento de largura número 0 não é um inteiro "
+"positivo."
 
-#: src/gettextp.c:164
+#: src/format-invalid.h:32
+#, c-format
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Na directiva número %u, o argumento de precisão número 0 não é um inteiro "
+"positivo."
+
+#: src/format-invalid.h:36
+#, c-format
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"Na directiva número %u, o carácter \"%c\" não é um especificador de "
+"conversão válido."
+
+#: src/format-invalid.h:37
+#, c-format
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"O carácter que termina a directiva número %u não é um especificador de "
+"conversão válido."
+
+#: src/format-invalid.h:40
+#, c-format
+msgid "The string refers to argument number %u in incompatible ways."
+msgstr "A cadeia refere o argumento %u de formas incompatíveis."
+
+#: src/format-java.c:240
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"Na directiva número %u, a sub-cadeia \"%s\" não é um estilo de data/hora "
+"válido."
+
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
+#, c-format
+msgid "In the directive number %u, \"%s\" is not followed by a comma."
+msgstr "Na directiva número %u, \"%s\" não é seguido de uma vírgula."
+
+#: src/format-java.c:274
+#, c-format
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Na directiva número %u, a sub-cadeia \"%s\" não é um estilo de número válido."
+
+#: src/format-java.c:323
+#, c-format
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Na directiva número %u, o número de argumento não é seguido de uma vírgula e "
+"um de \"%s\", \"%s\", \"%s\", \"%s\"."
+
+#: src/format-java.c:572
+#, c-format
+msgid "In the directive number %u, a choice contains no number."
+msgstr "Na directiva número %u, há uma escolha sem número."
+
+#: src/format-java.c:583
+#, c-format
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Na directiva número %u, há uma escolha com um número que não é seguido por "
+"\"<\", \"#\" ou \"%s\"."
+
+#: src/format-java.c:745
+#, c-format
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"uma especificação de formato para o argumento {%u}, como em \"%s\", não "
+"existe em \"%s\""
+
+#: src/format-java.c:756
+#, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr ""
+"uma especificação de formato para o argumento {%u} não existe em \"%s\""
+
+#: src/format-java.c:776
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"as especificações de formato em \"%s\" e \"%s\" para o argumento {%u} não "
+"são as mesmas"
+
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"A cadeia refere o argumento número %u mas ignora os argumentos %u e %u."
+
+#: src/format-kde.c:242
+#, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"uma especificação de formato para os argumentos %u e %u não existe em \"%s"
+"\", só um argumento pode ser ignorado"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, c-format
+msgid "error while parsing: %s"
+msgstr "erro ao analisar: %s"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
+#, c-format
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Na directiva número %u, o parâmetro %u é de tipo \"%s\", mas é esperado um "
+"parâmetro de tipo \"%s\"."
+
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+"Na directiva número %u, são dados demasiados parâmetros; esperado, no "
+"máximo, %u parâmetro."
+msgstr[1] ""
+"Na directiva número %u, são dados demasiados parâmetros; esperados, no "
+"máximo, %u parâmetros."
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
+#, c-format
+msgid "In the directive number %u, '%c' is not followed by a digit."
+msgstr "Na directiva número %u, \"%c\" não é seguido de um algarismo."
+
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
+#, c-format
+msgid "In the directive number %u, the argument %d is negative."
+msgstr "Na directiva número %u, o argumento %d é negativo."
+
+#: src/format-lisp.c:2808
+msgid "The string ends in the middle of a ~/.../ directive."
+msgstr "A cadeia termina no meio de uma directiva ~/.../."
+
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
+#, c-format
+msgid "Found '~%c' without matching '~%c'."
+msgstr "Encontrado \"~%c\" sem o correspondente \"~%c\""
+
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
+#, c-format
+msgid "In the directive number %u, both the @ and the : modifiers are given."
+msgstr "Na directiva número %u, tanto o modificador @ como o : são dados."
+
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
+#, c-format
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Na directiva número %u, \"~:[\" não é seguido de duas cláusulas, separadas "
+"por \"~;\"."
+
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
+#, c-format
+msgid "In the directive number %u, '~;' is used in an invalid position."
+msgstr "Na directiva número %u, \"~;\" é usado numa posição inválida."
+
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
+msgid "The string refers to some argument in incompatible ways."
+msgstr "A cadeia refere um argumento de formas incompatíveis."
+
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
+msgstr "as especificações de formato em \"%s\" e \"%s\" não são equivalentes"
+
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgstr ""
+"as especificações de formato \"%s\" não são um sub-conjunto daquelas em \"%s"
+"\""
+
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 ""
+"uma especificação de formato para o argumento \"%s\" não existe em \"%s\""
+
+#: src/format-perl.c:433
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Na directiva número %u, o especificador de tamanho é incompatível com o "
+"especificador de conversão \"%c\"."
+
+#: src/format-python-brace.c:138
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "Na directiva número %u, \"%c\" não pode começar um nome de campo."
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "Na directiva número %u, \"%c\" não pode começar um argumento getattr."
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "Na directiva número %u, \"%c\" não pode começar um argumento getitem."
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Na directiva número %u, não é permitido mais aninhamento num especificador "
+"de formato."
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Na directiva número %u, há uma directiva de formato indeterminado."
+
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"A cadeia refere argumentos tanto através de nomes de argumento como através "
+"de especificações de argumento sem nome."
+
+#: src/format-python.c:354
+#, c-format
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr "A cadeia refere o argumento chamado \"%s\" de formas incompatíveis."
+
+#: src/format-python.c:430
+#, c-format
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"as especificações de formato em \"%s\" esperam um mapa, as de \"%s\" esperam "
+"um tuple"
+
+#: src/format-python.c:437
+#, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"as especificações de formato em \"%s\" esperam um tuple, as de \"%s\" "
+"esperam um mapa"
+
+#: 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 '%s'"
+msgstr ""
+"uma especificação de formato para o argumento \"%s\", como em \"%s\", não "
+"existe em \"%s\""
+
+#: src/format-python.c:494
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"as especificações de formato em \"%s\" e \"%s\" para o argumento \"%s\" não "
+"são as mesmas"
+
+#: src/format-qt.c:152
+#, c-format
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"\"%s\" é uma cadeia de formato simples, mas \"%s\" não: contém uma bandeira "
+"\"L\" ou um número de argumento de dois algarismos"
+
+#: src/format-sh.c:79
+msgid "The string refers to a shell variable with a non-ASCII name."
+msgstr "A cadeia refere uma variável de shell com nome não-ASCII."
+
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"A cadeia refere uma variável de shell com sintaxe de shell complexa. Esta "
+"sintaxe não é suportada devido a razões de segurança."
+
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"A cadeia refere uma variável de shell ccujo valor pode ser diferente dentro "
+"de funções da shell."
+
+#: src/format-sh.c:85
+msgid "The string refers to a shell variable with an empty name."
+msgstr "A cadeia refere uma variável de shell com um nome vazio."
+
+#: src/format-ycp.c:90
+#, c-format
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+"Na directiva número %u, o carácter \"%c\" não é um algarismo entre 1 e 9."
+
+#: src/format-ycp.c:91
+#, c-format
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"O carácter que termina a directiva número %u não é um algarismo entre 1 e 9."
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
+msgid "Bruno Haible"
+msgstr "Bruno Haible"
+
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
+#, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:301 src/msgunfmt.c:210 src/xgettext.c:532
-#, fuzzy, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Tente `%s --help' para mais informa��o\n"
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION]\n"
+msgstr "Uso: %s [OPÇÃO]\n"
+
+#: src/hostname.c:216
+#, c-format
+msgid "Print the machine's hostname.\n"
+msgstr "Mostrar o nome de servidor da máquina.\n"
+
+#: src/hostname.c:219
+#, c-format
+msgid "Output format:\n"
+msgstr "Formato de saída:\n"
+
+#: src/hostname.c:221
+#, c-format
+msgid "  -s, --short                 short host name\n"
+msgstr "  -s, --short                 nome de servidor curto\n"
+
+#: src/hostname.c:223
+#, c-format
+msgid ""
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
+"                                name, and aliases\n"
+msgstr ""
+"  -f, --fqdn, --long          nome de servidor longo, inclui domínio "
+"totalmente qualificado\n"
+"                                nome e aliás\n"
+
+#: src/hostname.c:226
+#, c-format
+msgid "  -i, --ip-address            addresses for the hostname\n"
+msgstr "  -i, --ip-address            endereços para o nome de servidor\n"
+
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
+#, c-format, no-wrap
+msgid "Informative output:\n"
+msgstr "Saída informativa:\n"
+
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "impossível obter o nome de servidor"
+
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
+msgstr "selector não especificado"
+
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr "impossível criar contexto XPath"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
+msgstr "impossível avaliar expressão XPath: %s"
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr "nó \"%s\" não contém \"%s\""
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "valor de atributo \"%s\" inválido para \"%s\""
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr "o elemento raiz não é \"rules\" sob o namespace %s"
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "impossível ler %s: %s"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr "impossível avaliar localização XPath: %s"
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr "nó \"%s\" não tem \"%s\""
+
+#: src/locating-rule.c:307
+#, c-format
+msgid "cannot read XML file %s"
+msgstr "impossível ler ficheiro XML %s"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr "o elemento raiz não é \"locatingRules\""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#, c-format
+msgid "at most one input file allowed"
+msgstr "no máximo um ficheiro de entrada permitido"
+
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
+#, c-format
+msgid "%s and %s are mutually exclusive"
+msgstr "%s e %s são mutuamente exclusivas"
+
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#, c-format
+msgid "Usage: %s [OPTION] [INPUTFILE]\n"
+msgstr "Uso: %s [OPÇÃO] [FICHENTRADA]\n"
 
-#: src/gettextp.c:233
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
-"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-"  -e                        enable expansion of some escape sequences\n"
-"  -E                        (ignored for compatibility)\n"
-"  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
-"  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] [[[DIALECTO] MSGID] | [-s [MSGID]...]]\n"
-" -d, --domain=DIALECTO     obt�m as mensagems traduzidas do DIALECTO\n"
-" -e                        permite a expans�o de algumas sequ�ncias de escape\n"
-" -E                        (ignorado para compatibilidade)\n"
-" -h, --help                mostra esta ajuda e sai\n"
-" -n                        suprime o newline final\n"
-" -V, --version             mostra a informa��o de vers�o e sai\n"
-" [DIALECTO] MSGID          obt�m a mensagem traduzida correspondente a\n"
-"                           MSGID do DIALECTO\n"
-
-#: src/gettextp.c:245
+"Filters the messages of a translation catalog according to their attributes,\n"
+"and manipulates the attributes.\n"
+msgstr ""
+"Filtra as mensagens de um catálogo de tradução, de acordo com os seus atributos,\n"
+"e manipula os atributos.\n"
+
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
+#, c-format
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Argumentos obrigatórios para opções longas são também obrigatórios para "
+"opções curtas.\n"
+
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
+#, c-format
+msgid "Input file location:\n"
+msgstr "Localização do ficheiro de entrada:\n"
+
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#, c-format
+msgid "  INPUTFILE                   input PO file\n"
+msgstr "  INPUTFILE                   ficheiro PO de entrada\n"
+
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
+#, c-format
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=PASTA       adiciona PASTA à lista de procura de ficheiros "
+"de entrada\n"
+
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#, c-format
+msgid "If no input file is given or if it is -, standard input is read.\n"
+msgstr ""
+"Se não for dado um ficheiro de entrada ou for -, é lida a entrada padrão.\n"
+
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
+#, c-format
+msgid "Output file location:\n"
+msgstr "Localização do ficheiro de saída:\n"
+
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified file\n"
+msgstr ""
+"  -o, --output-file=FICHEIRO  escreve a saída no ficheiro especificado\n"
+
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
+#, c-format
+msgid ""
+"The results are written to standard output if no output file is specified\n"
+"or if it is -.\n"
+msgstr ""
+"Os resultados são escritos na saída padrão se não for dado nenhum ficheiro\n"
+"ou se for -.\n"
+
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
+#, c-format
+msgid "Message selection:\n"
+msgstr "Selecção de mensagem:\n"
+
+#: src/msgattrib.c:452
+#, c-format
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            mantém as traduzidas, remove as não "
+"traduzidas\n"
+
+#: src/msgattrib.c:454
+#, c-format
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          mantém as não traduzidas, remove as "
+"traduzidas\n"
+
+#: src/msgattrib.c:456
+#, c-format
+msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgstr ""
+"      --no-fuzzy              remove mensagens marcadas como aproximadas\n"
+
+#: src/msgattrib.c:458
+#, c-format
+msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
+msgstr ""
+"      --only-fuzzy            Mantém mensagens marcadas como aproximadas\n"
+
+#: src/msgattrib.c:460
+#, c-format
+msgid "      --no-obsolete           remove obsolete #~ messages\n"
+msgstr "      --no-obsolete           remove mensagens obsoletas #~\n"
+
+#: src/msgattrib.c:462
+#, c-format
+msgid "      --only-obsolete         keep obsolete #~ messages\n"
+msgstr "      --only-obsolete         mantém mensagens obsoletas #~\n"
+
+#: src/msgattrib.c:465
+#, c-format
+msgid "Attribute manipulation:\n"
+msgstr "Manipulação de atributos:\n"
+
+#: src/msgattrib.c:467
+#, c-format
+msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
+msgstr ""
+"      --set-fuzzy             marca todas as mensagens como aproximadas\n"
+
+#: src/msgattrib.c:469
+#, c-format
+msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+msgstr ""
+"      --clear-fuzzy           marca todas as mensagens como não-aproximadas\n"
+
+#: src/msgattrib.c:471
+#, c-format
+msgid "      --set-obsolete          set all messages obsolete\n"
+msgstr ""
+"      --set-obsolete          define todas as mensagens como  obsoletas\n"
+
+#: src/msgattrib.c:473
+#, c-format
+msgid "      --clear-obsolete        set all messages non-obsolete\n"
+msgstr ""
+"      --clear-obsolete        define todas as mensagens como não-obsoletas\n"
+
+#: src/msgattrib.c:475
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              ao marcar aproximadas, manter as msgids "
+"anteriores\n"
+"                              das mensagens traduzidas.\n"
+
+#: src/msgattrib.c:478
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        remove \"previous msgid\" de todas as "
+"mensagens\n"
+
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 ao remover \"aproximadas\", limpa também "
+"msgstr\n"
+
+#: src/msgattrib.c:482
+#, c-format
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FICH.po     manipula só entradas listadas em FICH.po\n"
+
+#: src/msgattrib.c:484
+#, c-format
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FICH.po   manipula só entradas não listadas em FICH.po\n"
+
+#: src/msgattrib.c:486
+#, c-format
+msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                 sinónimo para --only-fuzzy --clear-fuzzy\n"
+
+#: src/msgattrib.c:488
+#, c-format
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              sinónimo para --only-obsolete --clear-"
+"obsolete\n"
+
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
+#, c-format
+msgid "Input file syntax:\n"
+msgstr "Síntaxe do ficheiro de entrada:\n"
+
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
+#, c-format
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      ficheiro de entrada com sintaxe Java ."
+"properties\n"
+
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
+#, c-format
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     ficheiro de entrada com sintaxe NeXTstep/"
+"GNUstep .strings\n"
+
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
+#, c-format
+msgid "Output details:\n"
+msgstr "Detalhes da saída:\n"
+
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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 cores e outros atributos de texto\n"
+"      --color=QUANDO          usa cores e outros atributos de texto se "
+"QUANDO\n"
+"                              QUANDO pode ser \"always\", \"never\", \"auto"
+"\" ou \"html\".\n"
+
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=FICHESTILO      especifica ficheiro de regras CSS para --"
+"color\n"
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
+#, c-format
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             não usa escapes C na saída (predefinição)\n"
+
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
+#, c-format
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                usa escapes C na saída, sem caracteres "
+"estendidos\n"
+
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
+#, c-format
+msgid "      --force-po              write PO file even if empty\n"
+msgstr "      --force-po              escreve o ficheiro PO mesmo que vazio\n"
+
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
+#, c-format
+msgid "  -i, --indent                write the .po file using indented style\n"
+msgstr ""
+"  -i, --indent                escreve o ficheiro PO usando estilo indentado\n"
+
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
+#, c-format
+msgid "      --no-location           do not write '#: filename:line' lines\n"
+msgstr ""
+"      --no-location           não escreve linhas \"#: filename:line\"\n"
+
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
+#, c-format
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          gerar linhas \"#: filename:line"
+"\" (predefinição)\n"
+
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
+#, c-format
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                escreve um ficheiro PO estritamente Uniforum\n"
+
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
+#, c-format
+msgid "  -p, --properties-output     write out a Java .properties file\n"
+msgstr "  -p, --properties-output     escreve um ficheiro Java .properties\n"
+
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
+#, c-format
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    escreve um ficheiro NeXTstep/GNUstep .strings\n"
+
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
+#, c-format
+msgid "  -w, --width=NUMBER          set output page width\n"
+msgstr "  -w, --width=NÚMERO          define a largura de página da saída\n"
+
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
+#, 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ão quebrar linhas de mensagem longas, maiores "
+"que\n"
+"                              a largura de página da saída, em várias "
+"linhas\n"
+
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
+#, c-format
+msgid "  -s, --sort-output           generate sorted output\n"
+msgstr "  -s, --sort-output           gera uma saída ordenada\n"
+
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
+#, c-format
+msgid "  -F, --sort-by-file          sort output by file location\n"
+msgstr ""
+"  -F, --sort-by-file          ordena a saída por localização do ficheiro\n"
+
+#: src/msgcat.c:321 src/msgcomm.c:326
+#, c-format
+msgid "impossible selection criteria specified (%d < n < %d)"
+msgstr "especificou um critério de selecção impossível (%d < n < %d)"
+
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
+#, c-format
+msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
+msgstr "Uso: %s [OPÇÃO] [FICHENTRADA]...\n"
+
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
-"\n"
-"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-"environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-"regular directory, another location can be specified with the environment\n"
-"variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
-"Standard search directory: %s\n"
+"Concatenates and merges the specified PO files.\n"
+"Find messages which are common to two or more of the specified PO files.\n"
+"By using the --more-than option, greater commonality may be requested\n"
+"before messages are printed.  Conversely, the --less-than option may be\n"
+"used to specify less commonality before messages are printed (i.e.\n"
+"--less-than=2 will only print the unique messages).  Translations,\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
-"\n"
-"Se o par�metro DIALECTO n�o for fornecido, o dom�nio � determinado a\n"
-"partir da vari�vel TEXTDOMAIN do ambiente. Se o cat�logo de mensagens\n"
-"n�o for encontrado no direct�rio regular, pode ser especificada outra\n"
-"localiza��o atrav�s da vari�vel TEXTDOMAINDIR do ambiente.\n"
-"Quando usado com a op��o -s, o programa comporta-se como o comando\n"
-"`echo'. Contudo ele n�o copia simplesmente os seus argumentos para o\n"
-"stdout. Em vez disso as mensagens encontradas no cat�logo seleccionado\n"
-"s�o traduzidas.\n"
-"Direct�rio standard de pesquisa: %s\n"
+"Concatena e une os ficheiros PO especificados.\n"
+"Encontra mensagens comuns a dois ou mais dos ficheiros PO especificados.\n"
+"Usando a opção --more-than, acresce o número de objectos unidos antes\n"
+"das mensagens serem imprimidas. Inversamente, a opção --less-than pode ser\n"
+"usada para especificarmenos objectos antes da impressão (i.e.\n"
+"--less-than=2 só vai imprimir mensagens únicas).  Traduções,\n"
+"comentários, comentários extraídos e posições no ficheiro serão acumuladas, excepto\n"
+"se --use-first for especificada, caso em que serão tiradas do primeiro ficheiro PO\n"
+"para as definir.\n"
 
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:334 src/msgunfmt.c:234 src/xgettext.c:584
-msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
+#, c-format
+msgid "  INPUTFILE ...               input files\n"
+msgstr "  FICHENTRADA                 input files\n"
+
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
+#, c-format
+msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
+"  -f, --files-from=FICHEIRO   obter lista de ficheiros de entrada de "
+"FICHEIRO\n"
+
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
+#, c-format
+msgid "If input file is -, standard input is read.\n"
+msgstr "Se o ficheiro de entrada for -, é lida a entrada padrão.\n"
 
-#: src/message.c:784
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
+"  -<, --less-than=NUMBER      print messages with less than this many\n"
+"                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"as mensagens de internacionaliza��o n�o devem conter\n"
-"a sequ�ncia de escape `\\%c'"
+"  -<, --less-than=NÚMERO      imprime mensagens com menos destas NÙMERO\n"
+"                              definições, a predefinição é infinitas\n"
 
-#: src/message.c:1115
+#: src/msgcat.c:410
 #, c-format
-msgid "cannot create output file \"%s\""
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
+msgid ""
+"  ->, --more-than=NUMBER      print messages with more than this many\n"
+"                              definitions, defaults to 0 if not set\n"
+msgstr ""
+"  ->, --more-than=NÚMERO      imprime mensagens com mais destas NÚMERO\n"
+"                              definições, a predefinição é zero\n"
 
-#: src/message.c:1122
-#, no-c-format
-msgid "standard output"
-msgstr "canal de sa�da por defeito (stdout)"
+#: 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 ""
+"  -u, --unique                abreviatura para --less-than=2, pede\n"
+"                              que só mensagens únicas sejam imprimidas\n"
 
-#: src/message.c:1182
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "error while writing \"%s\" file"
-msgstr "erro durante a escrita do ficheiro \"%s\""
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      ficheiros de entrada com sintaxe Java ."
+"properties\n"
+
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
+#, c-format
+msgid ""
+"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
+"                              syntax\n"
+msgstr ""
+"      --stringtable-input     ficheiros de entrada com sintaxe\n"
+"                              NeXTstep/GNUstep .strings\n"
+
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
+#, c-format
+msgid "  -t, --to-code=NAME          encoding for output\n"
+msgstr "  -t, --to-code=NOME          codificação de saída\n"
+
+#: src/msgcat.c:429 src/msguniq.c:380
+#, c-format
+msgid ""
+"      --use-first             use first available translation for each\n"
+"                              message, don't merge several translations\n"
+msgstr ""
+"      --use-first             usa a primeira tradução disponível para cada\n"
+"                              mensagem, não une várias traduções\n"
+
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=CATÁLOGO         define o campo \"Language\" no cabeçalho do "
+"CATÁLOGO\n"
 
-#: src/msgcmp.c:160 src/msgmerge.c:270
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
+msgid "Peter Miller"
+msgstr "Peter Miller"
+
+#: src/msgcmp.c:188 src/msgmerge.c:389
+#, c-format
 msgid "no input files given"
-msgstr "ficheiros de entrada n�o fornecidos"
+msgstr "sem ficheiros de entrada"
 
-#: src/msgcmp.c:165 src/msgmerge.c:275
+#: src/msgcmp.c:193 src/msgmerge.c:394
+#, c-format
 msgid "exactly 2 input files required"
-msgstr "s�o necess�rios exactamente 2 ficheiros"
+msgstr "são requeridos exactamente 2 ficheiros"
 
-#: src/msgcmp.c:186
+#: src/msgcmp.c:212 src/msgmerge.c:540
+#, c-format
+msgid "Usage: %s [OPTION] def.po ref.pot\n"
+msgstr "Uso: %s [OPÇÂO] def.po ref.pot\n"
+
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
-"Usage: %s [OPTION] def.po ref.po\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -h, --help                  display this help and exit\n"
-"  -V, --version               output version information and exit\n"
-"\n"
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
-"old translations.  The ref.po file is the last created PO file\n"
-"(generally by xgettext).  This is useful for checking that you have\n"
-"translated each and every message in your program.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better diagnostics.\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] def.po ref.po\n"
-"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-"obrigat�rios para as op��es curtas.\n"
-"  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura para\n"
-"                              os ficheiros de entrada\n"
-"  -h, --help                  mostra esta ajuda e sai\n"
-"  -V, --version               mostra a informa��o de vers�o e sai\n"
-"\n"
-"Compara dois ficheiros .po do tipo Uniforum verificando se ambos\n"
-"cont�m o mesmo conjunto de cadeias msgid. O ficheiro def.po dever� ser\n"
-"um ficheiro PO existente, com as tradu��es antigas. O ficheiro ref.po\n"
-"ser� o �ltimo ficheiro PO criado (geralmente pelo xgettext). Isto �\n"
-"�til para verificar que todas as mensagens no seu programa foram\n"
-"traduzidas. Quando um emparelhamento exacto n�o puder ser efectuado,\n"
-"� usado um emparelhamento aproximado para produzir melhores\n"
-"diagn�sticos.\n"
-
-#: src/msgcmp.c:259 src/msgmerge.c:714
+"translations.  The ref.pot file is the last created PO file, or a PO Template\n"
+"file (generally created by xgettext).  This is useful for checking that\n"
+"you have translated each and every message in your program.  Where an exact\n"
+"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
+msgstr ""
+"Compara dois ficheiros PO estilo Uniforum para verificar se ambos contêm o mesmo\n"
+"conjunto de cadeias msgid. O ficheiro def.po é um ficheiro PO existente com as\n"
+"traduções. O ficheiro ref.pot é o último ficheiro PO criado ou um modelo \n"
+"PO Template (geralmente criado por xgettext). É útil para verificar se\n"
+"traduziu cada uma das mensagens no seu programa. Onde não seja encontrada uma\n"
+"correspondência exacta, é usado \"fuzzy\" para produzir melhores diagnósticos.\n"
+
+#: src/msgcmp.c:231
+#, c-format
+msgid "  def.po                      translations\n"
+msgstr "  def.po                      traduções\n"
+
+#: src/msgcmp.c:233
+#, c-format
+msgid "  ref.pot                     references to the sources\n"
+msgstr "  ref.pot                     referências às fontes\n"
+
+#: src/msgcmp.c:238 src/msgmerge.c:606
+#, c-format
+msgid "Operation modifiers:\n"
+msgstr "Modificadores de operação:\n"
+
+#: src/msgcmp.c:240 src/msgmerge.c:608
+#, 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 cada um dos domínios em def."
+"po\n"
+
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     não usar comparação de aproximadas\n"
+
+#: src/msgcmp.c:244
+#, c-format
+msgid "      --use-fuzzy             consider fuzzy entries\n"
+msgstr "      --use-fuzzy             considera entradas aproximadas\n"
+
+#: src/msgcmp.c:246
+#, c-format
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr "      --use-untranslated      considera entradas não traduzidas\n"
+
+#: src/msgcmp.c:324
+#, c-format
+msgid "this message is untranslated"
+msgstr "esta mensagem não está traduzida"
+
+#: src/msgcmp.c:330
+#, c-format
+msgid "this message needs to be reviewed by the translator"
+msgstr "esta mensagem precisa de ser revista pelo tradutor"
+
+#: src/msgcmp.c:369 src/msgmerge.c:1576
+#, c-format
 msgid "this message is used but not defined..."
-msgstr "esta mensagem � usada mas n�o definida..."
+msgstr "esta mensagem é usada mas não definida..."
 
-#: src/msgcmp.c:261 src/msgmerge.c:716
+#: src/msgcmp.c:372 src/msgmerge.c:1579
+#, c-format
 msgid "...but this definition is similar"
-msgstr "...mas esta defini��o � semelhante"
+msgstr "...mas esta definição é semelhante"
 
-#: src/msgcmp.c:267 src/msgmerge.c:743
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "esta mensagem � usada mas n�o definida em %s"
+msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgcmp.c:281
+#: src/msgcmp.c:546
+#, c-format
 msgid "warning: this message is not used"
-msgstr "aten��o: esta mensagem n�o � usada"
+msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:355 src/msgfmt.c:632 src/msgmerge.c:493 src/xgettext.c:1063
-msgid "duplicate message definition"
-msgstr "defini��o de mensagem duplicada"
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
+#, 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/msgcmp.c:356 src/msgfmt.c:633 src/msgmerge.c:494 src/xgettext.c:1064
-msgid "...this is the location of the first definition"
-msgstr "...este � o local da primeira defini��o"
+#: src/msgcomm.c:315
+#, c-format
+msgid "at least two files must be specified"
+msgstr "tem de especificar pelo menos dois ficheiros"
 
-#: src/msgcmp.c:396 src/msgmerge.c:542
+#: src/msgcomm.c:363
+#, c-format, no-wrap
+msgid ""
+"Find messages which are common to two or more of the specified PO files.\n"
+"By using the --more-than option, greater commonality may be requested\n"
+"before messages are printed.  Conversely, the --less-than option may be\n"
+"used to specify less commonality before messages are printed (i.e.\n"
+"--less-than=2 will only print the unique messages).  Translations,\n"
+"comments and extracted comments will be preserved, but only from the first\n"
+"PO file to define them.  File positions from all PO files will be\n"
+"cumulated.\n"
+msgstr ""
+"Encontre mensagens comuns a dois ou mais dos ficheiros PO especificados.\n"
+"Usando a opção --more-than, pode ser solicitada maior partilha antes que\n"
+"as mensagens sejam impressas. Por outro lado, a opção --less-than pode ser\n"
+"usada para especificar menos pontos comuns antes que as mensagens sejam \n"
+"impressas (i.e. --less-than=2 só imprimirá as mensagens únicas). Traduções,\n"
+"comentários e comentários extraídos serão preservados, mas só do primeiro\n"
+"ficheiro PO para os definir. As posições no ficheiro de todos os ficheiros\n"
+"PO serão acumuladas.\n"
+
+#: src/msgcomm.c:401
 #, c-format
-msgid "this message has no definition in the \"%s\" domain"
-msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
+msgid ""
+"  ->, --more-than=NUMBER      print messages with more than this many\n"
+"                              definitions, defaults to 1 if not set\n"
+msgstr ""
+"  ->, --more-than=NÚMERO      imprime mensagens com mais de NÙMERO\n"
+"                              definições, a predefinição é 1\n"
 
-#. We are about to construct the absolute path to the
-#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1258
-msgid "while preparing output"
-msgstr "durante a prepara��o da sa�da"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, c-format
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           não escrever \"msgid \"\"\" no cabeçalho\n"
 
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgconv.c:311
 #, c-format
-msgid "%s and %s are mutually exclusive"
-msgstr "%s e %s s�o mutuamente exclusivas"
+msgid "Converts a translation catalog to a different character encoding.\n"
+msgstr ""
+"Converte um catálogo de traduções numa codificação de caracteres diferente.\n"
 
-#: src/msgcomm.c:341
-msgid "at least two files must be specified"
+#: src/msgconv.c:335
+#, c-format
+msgid "Conversion target:\n"
+msgstr "Alvo da conversão:\n"
+
+#: src/msgconv.c:339
+#, c-format
+msgid "The default encoding is the current locale's encoding.\n"
+msgstr "A codificação predefinida é a codificação do idioma actual.\n"
+
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
+#, c-format
+msgid "  -i, --indent                indented output style\n"
+msgstr "  -i, --indent                estilo de saída indentado\n"
+
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
+#, c-format
+msgid "      --no-location           suppress '#: filename:line' lines\n"
+msgstr "      --no-location           suprime linhas \"#: filename:line\"\n"
+
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, c-format
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
+"  -n, --add-location          preserva linhas \"#: filename:line"
+"\" (predefinição)\n"
 
-#: src/msgcomm.c:360
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
-msgid "impossible selection criteria specified (%d < n < %d)"
+msgid "      --strict                strict Uniforum output style\n"
+msgstr "      --strict                estilo de saída estritamente Uniforum\n"
+
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
+#, c-format
+msgid "no input file given"
+msgstr "sem ficheiro de entrada"
+
+#: src/msgen.c:263
+#, c-format
+msgid "exactly one input file required"
+msgstr "é requerido exactamente um ficheiro de entrada"
+
+#: src/msgen.c:304
+#, c-format
+msgid "Usage: %s [OPTION] INPUTFILE\n"
+msgstr "Uso: %s [OPÇÃO] FICHENTRADA\n"
+
+#: src/msgen.c:309
+#, c-format, no-wrap
+msgid ""
+"Creates an English translation catalog.  The input file is the last\n"
+"created English PO file, or a PO Template file (generally created by\n"
+"xgettext).  Untranslated entries are assigned a translation that is\n"
+"identical to the msgid.\n"
 msgstr ""
+"Cria um catálodo de tradução inglês. O ficheiro de entrada é o último\n"
+"ficheiro PO inglês criado ou um ficheiro PO Template (geralmente criado\n"
+"com xgettext). Entradas por traduzir recebem uma tradução idêntica\n"
+"à msgid.\n"
 
-#: src/msgcomm.c:400
-#, fuzzy, c-format, no-wrap
+#: src/msgen.c:321
+#, c-format
+msgid "  INPUTFILE                   input PO or POT file\n"
+msgstr "  FICHENTRADA                 ficheiro de entrada PO ou POT\n"
+
+#: src/msgexec.c:201
+#, c-format
+msgid "missing command name"
+msgstr "nome de comando em falta"
+
+#: src/msgexec.c:262
+#, c-format
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+msgstr "Uso: %s [OPÇÃO] COMANDO [OPÇÃO-COMANDO]\n"
+
+#: src/msgexec.c:267
+#, c-format, no-wrap
 msgid ""
-"Usage: %s [OPTION] INPUTFILE ...\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"      --force-po                 write PO file even if empty\n"
-"  -F, --sort-by-file             sort output by file location\n"
-"  -h, --help                     display this help and exit\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] FICHEIRODEENTRADA...\n"
-"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-"obrigat�rios para as op��es curtas.\n"
-"  -a, --extract-all              extrai todas as cadeias\n"
-"  -c, --add-comments[=TAG]       coloca o bloco comentado com TAG (ou as\n"
-"                                 linhas de cabe�alho precedentes) no ficheiro\n"
-"                                 de sa�da.\n"
-"  -C, --c++                      reconhece coment�rios do tipo C++\n"
-"      --debug                    produz resultados mais detalhados do\n"
-"                                 reconhecimento das cadeias de formata��o\n"
-"  -d, --default-domain=NOME      usa NOME.po para a sa�da (em vez de\n"
-"                                 messages.po)\n"
-"  -D, --directory=DIRECT�RIO     adiciona DIRECT�RIO � lista de procura para\n"
-"   \"                             os ficheiros de entrada\n"
-"  -e, --no-escape                n�o usa sequ�ncias de escape do C na sa�da\n"
-"                                 (op��o por defeito)\n"
-"  -E, --escape                   usa sequ�ncias de escape do C na sa�da, n�o\n"
-"                                 usando caracteres especiais\n"
-"  -f, --files-from=FICHEIRO      obt�m lista de ficheiros de entrada de\n"
-"                                 FICHEIRO\n"
-"      --force-po                 escreve o ficheiro PO mesmo se este estiver\n"
-"                                 vazio\n"
-"  -F, --sort-by-file             ordena a sa�da pela localiza��o dos ficheiros\n"
-
-#: src/msgcomm.c:412
-#, fuzzy
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input.  It is invoked once for each translation.  Its output becomes\n"
+"msgexec's output.  msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+"Aplica um comando a todas as traduções de um catálogo de tradução.\n"
+"O COMANDO pode ser qualquer programa que lê uma tradução da entrada\n"
+"padrão. É chamado uma vez para cada tradução. A saída torna-se a\n"
+"saída do msgexec. O código de retorno do msgexec é o código de retorno\n"
+"máximo em todas as chamadas.\n"
+
+#: src/msgexec.c:276
+#, c-format, no-wrap
 msgid ""
-"  -i, --indent                   write the .po file using indented style\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-"  -n, --add-location             generate '#: filename:line' lines "
-"(default)\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory "
-"DIR\n"
-"  -s, --sort-output              generate sorted output and remove "
-"duplicates\n"
-"      --strict                   write out strict Uniforum conforming .po "
+"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 ""
+"Um comando especial interno, chamado \"0\", imprime a tradução, seguida de\n"
+"um byte nulo. A saída de \"msgexec 0\" serve como entrada para \"xargs -0\".\n"
+
+#: src/msgexec.c:281
+#, c-format
+msgid "Command input:\n"
+msgstr "Entrada co comando:\n"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  --newline                   adiciona newline no fim da entrada\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
+#, c-format
+msgid "  -i, --input=INPUTFILE       input PO file\n"
+msgstr "  -i, --input=INPUTFILE       ficheiro de entrada PO\n"
+
+#: src/msgexec.c:355
+#, c-format
+msgid "write to stdout failed"
+msgstr "falha ao escrever na saída padrão"
+
+#: src/msgfilter.c:304
+#, c-format
+msgid "missing filter name"
+msgstr "nome de filtro em falta"
+
+#: src/msgfilter.c:324
+#, c-format
+msgid "at least one sed script must be specified"
+msgstr "tem de especificar pelo menos um script sed"
+
+#: src/msgfilter.c:413
+#, c-format
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr "Uso: %s [OPÇÃO] FILTRO [OPÇÃO-FILTRO]\n"
+
+#: src/msgfilter.c:417
+#, c-format
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr "Aplica um filtro a todas as traduções de um catálogo de tradução.\n"
+
+#: src/msgfilter.c:441
+#, 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 ""
+"O FILTRO pode ser qualquer programa que leia a tradução da entrada padrão\n"
+"e escreva a tradução modificada na saída padrão.\n"
+
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr "Filtro de entrada e saída:\n"
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+"  --newline                   adiciona newline ao fim da entrada e\n"
+"                                remove newline do fim da saída"
+
+#: src/msgfilter.c:452
+#, c-format
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+msgstr "OPÇÕES de FILTRO quando o FILTRO é \"sed\":\n"
+
+#: src/msgfilter.c:454
+#, c-format
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=SCRIPT     adiciona SCRIPT aos comandos a executar\n"
+
+#: src/msgfilter.c:456
+#, c-format
+msgid ""
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
+"                                to be executed\n"
+msgstr ""
+"  -f, --file=FICHSCRIPT       adiciona o conteúdo de FICHSCRIPT aos "
+"comandos\n"
+"                                a executar\n"
+
+#: src/msgfilter.c:459
+#, c-format
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       suprime a impressão automática de espaço "
+"padrão\n"
+
+#: src/msgfilter.c:477 src/msggrep.c:600
+#, c-format
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             não usa escapes C na saída (predefinição)\n"
+
+#: src/msgfilter.c:483 src/msggrep.c:606
+#, c-format
+msgid "      --indent                indented output style\n"
+msgstr "      --indent                estilo de saída indentado\n"
+
+#: src/msgfilter.c:485
+#, c-format
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           mantém a entrada de cabeçalho sem modificação, "
+"não a filtra\n"
+
+#: src/msgfilter.c:665
+#, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "saída do filtro não termina com newline"
+
+#: src/msgfmt.c:372
+#, c-format
+msgid "the argument to %s should be a single punctuation character"
+msgstr "o argumento para %s deve ser um único carácter de pontuação"
+
+#: src/msgfmt.c:419
+#, c-format
+msgid "invalid endianness: %s"
+msgstr "endianness inválida: %s"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
+msgstr "Ulrich Drepper"
+
+#: src/msgfmt.c:471
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "não deve indicar ficheiro de entrada se %s e%s forem especificadas"
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr "%s requer uma especificação \"-d pasta\""
+
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
+#, c-format
+msgid "%s requires a \"-l locale\" specification"
+msgstr "%s requer uma especificação \"-l idioma\""
+
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s requer uma especificação \"--template modelo\""
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s requer uma especificação \"-o ficheiro\""
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s e %s são mutuamente exclusivas em %s"
+
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
+#, c-format
+msgid "%s is only valid with %s or %s"
+msgstr "%s só é válida com %s ou %s"
+
+#: src/msgfmt.c:632 src/msgfmt.c:638
+#, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s só é válida com %s, %s ou %s"
+
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "impossível localizar regras ITS para %s"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/msgfmt.c:876
+#, c-format
+msgid "%d translated message"
+msgid_plural "%d translated messages"
+msgstr[0] "%d mensagem traduzida"
+msgstr[1] "%d mensagens traduzidas"
+
+#: src/msgfmt.c:881
+#, c-format
+msgid ", %d fuzzy translation"
+msgid_plural ", %d fuzzy translations"
+msgstr[0] ", %d tradução aproximada"
+msgstr[1] ", %d traduções aproximadas"
+
+#: src/msgfmt.c:886
+#, 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:906
+#, c-format
+msgid "Usage: %s [OPTION] filename.po ...\n"
+msgstr "Uso: %s [OPÇÃO] ficheiro.po ...\n"
+
+#: src/msgfmt.c:910
+#, c-format
+msgid "Generate binary message catalog from textual translation description.\n"
+msgstr ""
+"Gerar catálogo de mensagens binário de descrição de tradução textual.\n"
+
+#: src/msgfmt.c:922
+#, c-format
+msgid "  filename.po ...             input files\n"
+msgstr "  filename.po ...             ficheiros de entrada\n"
+
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
+#, c-format
+msgid "Operation mode:\n"
+msgstr "Modo de operação:\n"
+
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Modo Java: gera uma classe Java "
+"ResourceBundle\n"
+
+#: src/msgfmt.c:933
+#, c-format
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 como --java e assume Java2 (JDK 1.2 ou "
+"posterior)\n"
+
+#: src/msgfmt.c:935
+#, c-format
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                modo C#: gera um ficheiro .NET .dll\n"
+
+#: src/msgfmt.c:937
+#, c-format
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"  -u, --unique                   shorthand for --less-than=2, requests\n"
-"                                 that only unique messages be printed\n"
-msgstr ""
-" -n, --add-location             gera linhas do tipo '#: filename:line'\n"
-"                                (op��o utilizada por defeito)\n"
-"     --omit-header              n�o escreve cabe�alhos com campos "
-"`msgid\"\"'\n"
-" -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
-"                                direct�rio DIR\n"
-" -s, --sort-output              gera resultados ordenados, removendo os\n"
-"                                duplicados\n"
-"     --strict                   escreve um ficheiro .po de acordo com o\n"
-"                                modo Uniforum estrito\n"
-" -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
-" -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"
-" -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
-"\n"
-"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
-"usado.\n"
-
-#: src/msgcomm.c:425
-msgid ""
-"  -V, --version                  output version information and exit\n"
-"  -w, --width=NUMBER             set output page width\n"
-"  -<, --less-than=NUMBER         print messages with less than this many\n"
-"                                 definitions, defaults to infinite if not\n"
-"                                 set\n"
-"  ->, --more-than=NUMBER         print messages with more than this many\n"
-"                                 definitions, defaults to 1 if not set\n"
-"\n"
-"Find messages which are common to two or more of the specified PO files.\n"
-"By using the --more-than option, greater commonality may be requested\n"
-"before messages are printed.  Conversely, the --less-than option may be\n"
-"used to specify less commonality before messages are printed (i.e.\n"
-"--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
-"PO file to define them.  File positions from all PO files will be\n"
-"preserved.\n"
 msgstr ""
+"      --csharp-resources      modo de recursos C#: gera um ficheiro .NET ."
+"resources\n"
 
-#: src/msgcomm.c:476 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:618
+#: src/msgfmt.c:939
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "erro durante a abertura de \"%s\" para leitura"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   modo Tcl: gera um ficheiro tcl/msgcat .msg\n"
 
-#: src/msgcomm.c:557 src/xgettext.c:660 src/xgettext.c:970
-msgid "this file may not contain domain directives"
-msgstr "este ficheiro n�o pode conter directivas de dom�nio"
+#: src/msgfmt.c:941
+#, c-format
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr "      --qt                    modo Qt: gera um ficheiro Qt .qm\n"
 
-#: src/msgfmt.c:273 src/xgettext.c:410
-msgid "no input file given"
-msgstr "nenhum ficheiro de entrada fornecido"
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               modo de entrada Desktop: gera um ficheiro ."
+"desktop\n"
 
-#: src/msgfmt.c:321
+#: src/msgfmt.c:945
 #, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "erro durante a abertura de \"%s\" para escrita"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --xml                   modo XML: gera um ficheiro XML\n"
 
-#: src/msgfmt.c:343
+#: src/msgfmt.c:952
 #, c-format
-msgid "%d translated messages"
-msgstr "%d mensagens traduzidas"
+msgid "      --strict                enable strict Uniforum mode\n"
+msgstr "      --strict                activa o modo estritamente Uniforum\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
-msgid ", %d fuzzy translations"
-msgstr ", %d tradu��es aproximadas"
+msgid "If output file is -, output is written to standard output.\n"
+msgstr "Se o ficheiro de saída for -, a saída é escrita na saída padrão.\n"
 
-#: src/msgfmt.c:347
+#: src/msgfmt.c:957
 #, c-format
-msgid ", %d untranslated messages"
-msgstr ", %d mensagens n�o traduzidas"
+msgid "Output file location in Java mode:\n"
+msgstr "Localização do ficheiro de saída em modo Java:\n"
 
-#: src/msgfmt.c:366
-#, fuzzy, c-format, no-wrap
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
+#, c-format
+msgid "  -r, --resource=RESOURCE     resource name\n"
+msgstr "  -r, --resource=RECURSO      nome do recurso\n"
+
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=IDIOMA         nome do idioma, seja idioma seja "
+"language_COUNTRY\n"
+
+#: src/msgfmt.c:963
+#, c-format
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                produz um ficheiro .java, em vez de um "
+"ficheiro .class\n"
+
+#: src/msgfmt.c:965
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d PASTA                    pasta base da hierarquia de pastas de classe\n"
+
+#: src/msgfmt.c:967
+#, c-format
+msgid ""
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
+"separated with an underscore.  The -d option is mandatory.  The class is\n"
+"written under the specified directory.\n"
+msgstr ""
+"O nome da classe é determinado anexando o nome do idioma ao nome do "
+"recurso,\n"
+"separado por um sublinhado. A opão -d é obrigatória. A classe á escrita\n"
+"sob a pasta especificada.\n"
+
+#: src/msgfmt.c:973
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "Localização do ficheiro de saída em modo C#:\n"
+
+#: src/msgfmt.c:979 src/msgunfmt.c:473
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d PASTA                    pasta base para ficheiros .dll  dependentes de "
+"idioma\n"
+
+#: src/msgfmt.c:981
+#, 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 ""
+"As opções -l e -d são obrigatórias. O ficheiro .dll é escrito numa\n"
+"sub-pasta da pasta especificada, cujo nome depende do idioma.\n"
+
+#: src/msgfmt.c:985
+#, c-format
+msgid "Output file location in Tcl mode:\n"
+msgstr "Localização do ficheiro de saída em modo Tcl:\n"
+
+#: src/msgfmt.c:989 src/msgunfmt.c:483
+#, c-format
+msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgstr ""
+"  -d PASTA                    pasta base para catálogos de mensagens .msg\n"
+
+#: src/msgfmt.c:991
+#, c-format
+msgid ""
+"The -l and -d options are mandatory.  The .msg file is written in the\n"
+"specified directory.\n"
+msgstr ""
+"As opções -l e -d são obrigatórias. O ficheiro .msg é escrito na\n"
+"pasta especificada.\n"
+
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Opções do modo de entrada desktop:\n"
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr "  --template=MODELO           um ficheiro .desktop usado como modelo\n"
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr "  -d PASTA                    pasta base para ficheiros .po\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, c-format
+msgid ""
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
+msgstr ""
+"  -kWORD, --keyword=PALAVRA   procura por PALAVRA como palavra-chave "
+"adicional\n"
+"  -k, --keyword               não usa as palavras-chave predefinidas\n"
+
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"As opções -l -o e -template são obrigatórias. Se -D for especificada, os\n"
+"ficheiros de entrada são lidos da pasta em vez dos argumentos do comando.\n"
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr "Opções do modo XML:\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr "  -L, --language=NOME         reconhece a linguagem XML especificaa\n"
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr "  --template=MODELO           um ficheiro XML usado como modelo\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
+#, c-format
+msgid "Input file interpretation:\n"
+msgstr "Interpretação do ficheiro de entrada:\n"
+
+#: src/msgfmt.c:1038
+#, c-format
+msgid ""
+"  -c, --check                 perform all the checks implied by\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
+msgstr ""
+"  -c, --check                 realiza todos os testes implícitos em\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
+
+#: src/msgfmt.c:1041
+#, c-format
+msgid "      --check-format          check language dependent format strings\n"
+msgstr ""
+"      --check-format          testa cadeias por formato dependente do "
+"idioma\n"
+
+#: src/msgfmt.c:1043
+#, c-format
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          verifica a presença e conteúdo da entrada de "
+"cabeçalho\n"
+
+#: src/msgfmt.c:1045
+#, c-format
+msgid ""
+"      --check-domain          check for conflicts between domain directives\n"
+"                                and the --output-file option\n"
+msgstr ""
+"      --check-domain          testa conflitos entre directivas de domínio\n"
+"                                e a opção --output-file\n"
+
+#: src/msgfmt.c:1048
+#, c-format
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   verifica se GNU msgfmt se comporta como X/Open "
+"msgfmt\n"
+
+#: src/msgfmt.c:1050
+#, c-format
+msgid ""
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
+"                                menu items\n"
+msgstr ""
+"      --check-accelerators[=CAR]   testa a presença de atalhos de teclado "
+"para\n"
+"                                   itens de menu\n"
+
+#: src/msgfmt.c:1053
+#, c-format
+msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
+msgstr "  -f, --use-fuzzy             usa entradas aproximadas na saída\n"
+
+#: src/msgfmt.c:1058
+#, c-format
 msgid ""
-"Usage: %s [OPTION] filename.po ...\n"
-"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"
-"  -c, --check                 perform language dependent checks on strings\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -f, --use-fuzzy             use fuzzy entries in output\n"
-"  -h, --help                  display this help and exit\n"
+msgstr ""
+"  -a, --alignment=NÚMERO      alinha cadeias a NÚMERO bytes (predefinição: "
+"%d)\n"
+
+#: src/msgfmt.c:1060
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
+"      --endianness=ORDBYTE    escreve números 32-bit na ordem de byte "
+"indicada\n"
+"                                (big ou little, a predefinição depende da "
+"plataforma)\n"
+
+#: src/msgfmt.c:1063
+#, c-format
+msgid ""
 "      --no-hash               binary file will not include the hash table\n"
-"  -o, --output-file=FILE      specify output file name as FILE\n"
-"      --statistics            print statistics about translations\n"
-"      --strict                enable strict Uniforum mode\n"
-"  -v, --verbose               list input file anomalies\n"
-"  -V, --version               output version information and exit\n"
+msgstr ""
+"      --no-hash               o ficheiro binário não inclui a tabela de "
+"hash\n"
+
+#: src/msgfmt.c:1072
+#, c-format
+msgid "      --statistics            print statistics about translations\n"
+msgstr "      --statistics            mostra estatísticas da tradução\n"
+
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
+#, c-format
+msgid "  -v, --verbose               increase verbosity level\n"
+msgstr "  -v, --verbose               aumenta a verbosidade\n"
+
+#: src/msgfmt.c:1185
+#, c-format
+msgid "warning: PO file header missing or invalid\n"
+msgstr "aviso: cabeçalho do ficheiro PO em falta ou inválido\n"
+
+#: src/msgfmt.c:1187
+#, c-format
+msgid "warning: charset conversion will not work\n"
+msgstr "aviso: a conversão do conjunto de caracteres não vai funcionar\n"
+
+#: src/msgfmt.c:1211
+#, c-format
+msgid "domain name \"%s\" not suitable as file name"
+msgstr "nome de domínio \"%s\" inadequado como nome de ficheiro"
+
+#: src/msgfmt.c:1216
+#, c-format
+msgid "domain name \"%s\" not suitable as file name: will use prefix"
+msgstr ""
+"nome de domínio \"%s\" inadequado como nome de ficheiro: será usado um "
+"prefixo"
+
+#: src/msgfmt.c:1230
+#, c-format
+msgid "'domain %s' directive ignored"
+msgstr "directiva \"domínio %s\" ignorada"
+
+#: src/msgfmt.c:1290
+#, c-format
+msgid "empty 'msgstr' entry ignored"
+msgstr "entrada \"msgstr\" vazia ignorada"
+
+#: src/msgfmt.c:1291
+#, c-format
+msgid "fuzzy 'msgstr' entry ignored"
+msgstr "entrada \"msgstr\" aproximada ignorada"
+
+#: src/msgfmt.c:1339
+#, c-format
+msgid "%s: warning: source file contains fuzzy translation"
+msgstr "%s: aviso: o ficheiro fonte contém traduções aproximadas"
+
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr "%s não existe"
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s existe mas não está legível"
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
+#, c-format
+msgid "error while reading \"%s\""
+msgstr "erro ao ler \"%s\""
+
+#: src/msggrep.c:501
+#, c-format
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" or \"X\" "
+"terem sido especificadas"
+
+#: src/msggrep.c:521
+#, 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 ""
+"Extrai todas as mensagens de um catálogo de tradução que cumpram um dado padrão\n"
+"ou que pertençam a alguns dados ficheiros-fonte.\n"
+
+#: src/msggrep.c:547
+#, c-format, no-wrap
+msgid ""
+"Message selection:\n"
+"  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
+"  [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n"
+"  [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n"
+"A message is selected if it comes from one of the specified source files,\n"
+"or if it comes from one of the specified domains,\n"
+"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n"
+"or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
+"or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
+"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n"
+"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n"
+"\n"
+"When more than one selection criterion is specified, the set of selected\n"
+"messages is the union of the selected messages of each criterion.\n"
 "\n"
-"Giving the -v option more than once increases the verbosity level.\n"
+"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
+"EXTRACTED-COMMENT-PATTERN syntax:\n"
+"  [-E | -F] [-e PATTERN | -f FILE]...\n"
+"PATTERNs are basic regular expressions by default, or extended regular\n"
+"expressions if -E is given, or fixed strings if -F is given.\n"
+"\n"
+"  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
+"  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+"  -J, --msgctxt               start of patterns for the msgctxt\n"
+"  -K, --msgid                 start of patterns for the msgid\n"
+"  -T, --msgstr                start of patterns for the msgstr\n"
+"  -C, --comment               start of patterns for the translator's comment\n"
+"  -X, --extracted-comment     start of patterns for the extracted comment\n"
+"  -E, --extended-regexp       PATTERN is an extended regular expression\n"
+"  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
+"  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
+"  -f, --file=FILE             obtain PATTERN from FILE\n"
+"  -i, --ignore-case           ignore case distinctions\n"
+"  -v, --invert-match          output only the messages that do not match any\n"
+"                              selection criterion\n"
+msgstr ""
+"Selecção de mensagem:\n"
+"  [-N FICHFONTE]... [-M NOMEDOMÍNIO]...\n"
+"  [-J PADRÃO-MSGCTXT] [-K PADRÃO-MSGID] [-T PADRÃO-MSGSTR]\n"
+"  [-C PADRÃO-COMENTÁRIO] [-X PADRÃO-COMENTÁRIO-EXTRAÍDO]\n"
+"A mensagem é seleccionada se vier de um dos ficheiros-fonte,\n"
+"ou se vier de um dos domínios especificados,\n"
+"ou se -J for indicado e o seu contexto (msgctxt) corresponder a PADRÃO-MSGCTXT,\n"
+"ou se -K for indicado e a sua chave (msgid or msgid_plural) corresponder a PADRÃO-MSGID,\n"
+"ou se -T for indicado e a sua tradução (msgstr) corresponder a PADRÃO-MSGSTR,\n"
+"ou se -C for indicado e o comentário do tradutor corresponder a PADRÃO-COMENTÁRIO,\n"
+"ou se -X for indicado e o comentário extraído corresponder a PADRÃO-COMENTÁRIO-EXTRAÍDO.\n"
 "\n"
-"If input file is -, standard input is read.  If output file is -,\n"
-"output is written to standard output.\n"
-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"
-"  -c, --check                 executa testes dependentes da linguagem na\n"
-"                              cadeia\n"
-"  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura para\n"
-"                              os ficheiros de entrada\n"
-"  -h, --help                  mostra esta ajuda e sai\n"
-"      --no-hash               o ficheiro bin�rio n�o ir� incluir a tabela\n"
-"                              de dispers�o\n"
-"  -o, --output-file=FICHEIRO  especifica o nome do ficheiro de sa�da como\n"
-"                              FICHEIRO\n"
-"      --statistics            escreve informa��o estat�stica sobre as\n"
-"                              tradu��es\n"
-"      --strict                usa o modo Uniforum estrito\n"
-"  -v, --verbose               lista as anormalias no ficheiro de entrada\n"
-"  -V, --version               mostra a informa��o de vers�o e sai\n"
+"Quando mais de um critério de selecção for especificado, o conjunto de mensagens\n"
+"seleccionadas é a união das mensagens seleccionadas de cada critério.\n"
 "\n"
-"Se o ficheiro de entrada � -, � usado o canal de entrada stdin. Se o\n"
-"ficheiro de sa�da � -, a sa�da � escrita no canal de sa�da stdout.\n"
+"Sintaxe de PADRÃO-MSGCTXT, PADRÃO-MSGID, PADRÃO-MSGSTR, PADRÃO-COMENTÁRIO ou\n"
+"PADRÃO-COMENTÁRIO-EXTRAÍDO:\n"
+"  [-E | -F] [-e PADRÃO | -f FICHEIRO]...\n"
+"PADRÕES são expressões regulares básicas por predefinição, expressões\n"
+"regulares estendidas se -E for dado, ou cadeias fixas se -F for dado.\n"
+"\n"
+"  -N, --location=FICHFONTEE   selecciona mensagens extraídas de FICHFONTE\n"
+"  -M, --domain=NOMEDOMÍNIO    selecciona mensagens pertencentes a NOMEDOMÍNIO\n"
+"  -J, --msgctxt               início dos padrões para msgctxt\n"
+"  -K, --msgid                 início dos padrões para msgid\n"
+"  -T, --msgstr                início dos padrões para msgstr\n"
+"  -C, --comment               início dos padrões para o comentário do tradutor\n"
+"  -X, --extracted-comment     início dos padrões para o comentário extraído\n"
+"  -E, --extended-regexp       PADRÃO é uma expressão regular estendida\n"
+"  -F, --fixed-strings         PADRÃO é um conjunto de cadeias separadas por newline\n"
+"  -e, --regexp=PADRÃON        usa PADRÃO como expressão regular\n"
+"  -f, --file=FICHEIRO         obter PADRÃO de FICHEIRO\n"
+"  -i, --ignore-case           ignora diferenças entre maiúsculas e minúsculas\n"
+"  -v, --invert-match          imprime só mensagens que não cumprem nenhum critério\n"
+"                              de selecção\n"
+
+#: src/msggrep.c:602
+#, c-format
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                usa escapes C na saída, não caracteres "
+"estendidos\n"
 
-#: src/msgfmt.c:409
-msgid "while creating hash table"
-msgstr "durante a cria��o da tabela de dispers�o"
+#: src/msggrep.c:623
+#, c-format
+msgid "      --sort-output           generate sorted output\n"
+msgstr "      --sort-output           gera saída ordenada\n"
 
-#: src/msgfmt.c:451
+#: src/msggrep.c:625
+#, c-format
+msgid "      --sort-by-file          sort output by file location\n"
+msgstr ""
+"      --sort-by-file          ordena a saída por localização do ficheiro\n"
+
+#: src/msginit.c:299
 #, fuzzy, c-format
-msgid "%s: warning: no header entry found"
-msgstr "cuidado: nenhum elemento encontrado no cabe�alho"
+#| 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"
+msgid ""
+"You are in a language indifferent environment.  Please set\n"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
+msgstr ""
+"Está num ambiente indiferente a idiomas. Por favor, defina\n"
+"a sua variável de ambiente LANG, como descrito no ficheiro\n"
+"ABOUT-NLS. Isto é necessário se quiser testar as suas traduções.\n"
 
-#: src/msgfmt.c:473
+#: src/msginit.c:325
 #, c-format
-msgid "domain name \"%s\" not suitable as file name"
-msgstr "nome de dom�nio \"%s\" n�o apropriado como nome de ficheiro"
+msgid ""
+"Output file %s already exists.\n"
+"Please specify the locale through the --locale option or\n"
+"the output .po file through the --output-file option.\n"
+msgstr ""
+"Ficheiro de saída %s já existe.\n"
+"Por favor, especifique o idioma via opção --locale ou\n"
+"o ficheiro PO de saída via opção --output-file.\n"
 
-#: src/msgfmt.c:478
+#: src/msginit.c:351
 #, c-format
-msgid "domain name \"%s\" not suitable as file name: will use prefix"
+msgid "Created %s.\n"
+msgstr "Criado %s.\n"
+
+#: src/msginit.c:371
+#, c-format, no-wrap
+msgid ""
+"Creates a new PO file, initializing the meta information with values from the\n"
+"user's environment.\n"
 msgstr ""
-"nome de dom�nio \"%s\" n�o apropriado como nome de ficheiro:\n"
-"prefixo usado"
+"Cria um novo ficheiro PO, inicializando a meta-informação com valores do\n"
+"ambiente do utilizador.\n"
 
-#. We don't change the exit status here because this is really
-#. only an information.
-#: src/msgfmt.c:491
+#: src/msginit.c:381
 #, c-format
-msgid "`domain %s' directive ignored"
-msgstr "directiva `dom�nio %s' ignorada"
+msgid "  -i, --input=INPUTFILE       input POT file\n"
+msgstr "  -i, --input=FICHENTRADA     ficheiro de entrada POT\n"
 
-#: src/msgfmt.c:519
-msgid "empty `msgstr' entry ignored"
-msgstr "elemento `msgstr' vazio ignorada"
+#: src/msginit.c:383
+#, c-format
+msgid ""
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
+"If it is -, standard input is read.\n"
+msgstr ""
+"Se não for dado nenhum ficheiro de entrada, é procurado um ficheiro POT na\n"
+"pasta actual. Se for -, é lida a entrada padrão.\n"
 
-#: src/msgfmt.c:520
-#, fuzzy
-msgid "fuzzy `msgstr' entry ignored"
-msgstr "elemento `msgstr' vazio ignorada"
+#: src/msginit.c:389
+#, c-format
+msgid "  -o, --output-file=FILE      write output to specified PO file\n"
+msgstr ""
+"  -o, --output-file=FICHEIRO  escreve a saída no ficheiro PO especificado\n"
 
-#: src/msgfmt.c:563
+#: src/msginit.c:391
 #, c-format
-msgid "headerfield `%s' missing in header"
-msgstr "o campo `%s' falta no cabe�alho"
+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 ""
+"Se não for dado um ficheiro de saída, depende da opção --locale ou da "
+"definição\n"
+"regional do utilizador. Se for -, os resultados são escritos na saída "
+"padrão.\n"
+
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
+msgstr "  -l, --locale=LL_CC          define o idioma alvo\n"
 
-#: src/msgfmt.c:566
+#: src/msginit.c:406
 #, c-format
-msgid "header field `%s' should start at beginning of line"
-msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         assume que o ficheiro PO é automaticamente "
+"gerado\n"
 
-#: src/msgfmt.c:576
-#, fuzzy
-msgid "some header fields still have the initial default value"
-msgstr "alguns campos do cabe�alho ainda t�m o valor inicial por defeito"
+#: src/msginit.c:472
+msgid ""
+"Found more than one .pot file.\n"
+"Please specify the input .pot file through the --input option.\n"
+msgstr ""
+"Encontrados vários ficheiros POT.\n"
+"Por favor, especifique o ficheiro de entrada POT via opção --input.\n"
 
-#: src/msgfmt.c:587
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
-msgid "field `%s' still has initial default value"
-msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+msgid "error reading current directory"
+msgstr "erro ao ler a pasta actual"
 
-#: src/msgfmt.c:672
-#, fuzzy, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
+#: src/msginit.c:493
+msgid ""
+"Found no .pot file in the current directory.\n"
+"Please specify the input .pot file through the --input option.\n"
+msgstr ""
+"Sem ficheiros POT na pasta actual.\n"
+"Por favor, especifique o ficheiro de entrada POT via opção --input.\n"
 
-#: src/msgfmt.c:874
-#, 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/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
+#, c-format
+msgid "%s subprocess failed with exit code %d"
+msgstr "sub-processo %s falhou com código de saída %d"
 
-#: src/msgfmt.c:882
-#, 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/msginit.c:1117
+msgid ""
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
+"you in case of unexpected technical problems.\n"
+msgstr ""
+"O novo catálogo de mensagens deve conter o seu endereço de email, para que "
+"os\n"
+"utilizadores possam comentar a tradução e para que os gestores o possam "
+"contactar\n"
+"em caso de problemas técnicos inesperados.\n"
 
-#: src/msgfmt.c:896
-msgid "number of format specifications in `msgid' and `msgstr' does not match"
-msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
+#. TRANSLATORS: "English" needs to be replaced by your language.
+#. For example in it.po write "Traduzioni italiani ...",
+#. *not* "Traduzioni inglesi ...".
+#: src/msginit.c:1621
+#, c-format
+msgid "English translations for %s package"
+msgstr "Tradução portuguesa (Portugal) para o pacote %s"
 
-#: src/msgfmt.c:913
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
-msgid "format specifications for argument %u are not the same"
-msgstr "as especifica��es do argumento %u s�o diferentes"
+msgid "present charset \"%s\" is not a portable encoding name"
+msgstr ""
+"conjunto de caracteres actual \"%s\" não é um nome de codificação portátil."
 
-#: src/msgmerge.c:306
-#, fuzzy, c-format, no-wrap
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
+#, c-format
+msgid "two different charsets \"%s\" and \"%s\" in input file"
+msgstr ""
+"dois conjuntos de caracteres diferentes \"%s\" e\"%s\" no ficheiro de entrada"
+
+#: src/msgl-cat.c:203
+#, c-format
 msgid ""
-"Usage: %s [OPTION] def.po ref.po\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-"  -E, --escape                use C escapes in output, no extended chars\n"
-"      --force-po              write PO file even if empty\n"
-"  -h, --help                  display this help and exit\n"
-"  -i, --indent                indented output style\n"
-"  -o, --output-file=FILE      result will be written to FILE\n"
-"      --no-location           suppress '#: filename:line' lines\n"
-"      --add-location          preserve '#: filename:line' lines (default)\n"
-"      --strict                strict Uniforum output style\n"
-"  -v, --verbose               increase verbosity level\n"
-"  -V, --version               output version information and exit\n"
-"  -w, --width=NUMBER          set output page width\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] def.po ref.po\n"
-"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-"obrigat�rios para as op��es curtas.\n"
-"  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura para\n"
-"                              os ficheiros de entrada\n"
-"  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
-"                              (op��o por defeito)\n"
-"  -E, --escape                usa sequ�ncias de escape do C na sa�da, n�o\n"
-"                              usando caracteres especiais\n"
-"  -h, --help                  mostra esta ajuda e sai\n"
-"  -i, --indent                modo de sa�da alinhado\n"
-"  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no FICHEIRO\n"
-"      --strict                modo de sa�da Uniforum estrito\n"
-"  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
-"  -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/msgmerge.c:324
-#, no-wrap
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"ficheiro \"%s\" sem entrada de cabeçalho com especificação de conjunto de "
+"caracteres"
+
+#: 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 ""
+"domínio \"%s\" no ficheiro de entrada \"%s\" sem entrada de cabeçalho com "
+"especificação de conjunto de caracteres"
+
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
+#, c-format
+msgid "target charset \"%s\" is not a portable encoding name."
+msgstr ""
+"conjunto de caracteres alvo \"%s\" não é um nome de codificação portátil."
+
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
+#, c-format
+msgid "warning: "
+msgstr "aviso: "
+
+#: src/msgl-cat.c:444
+#, c-format
+msgid ""
+"Input files contain messages in different encodings, UTF-8 among others.\n"
+"Converting the output to UTF-8.\n"
+msgstr ""
+"ficheiros de entrada com mensagens em codificações diferentes, UTF-8 entre "
+"outras.\n"
+"A converter a saída para UTF-8.\n"
+
+#: src/msgl-cat.c:450
+#, c-format
+msgid ""
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
+"Converting the output to UTF-8.\n"
+"To select a different output encoding, use the --to-code option.\n"
+msgstr ""
+"ficheiros de entrada com mensagens em codificações diferentes, UTF%s e%s "
+"entre outras.\n"
+"A converter a saída para UTF-8.\n"
+"Para seleccionar uma codificação de saída diferente, use a opção --to-code.\n"
+
+#: src/msgl-cat.c:489
+#, c-format
+msgid ""
+"Conversion of file %s from %s encoding to %s encoding\n"
+"changes some msgids or msgctxts.\n"
+"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
+"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
+msgstr ""
+"Conversão do ficheiro %s da codificação %s para a codificação %s\n"
+"altera algumas msgids ou msgctxts.\n"
+"Ou altera todas as msgids e msgctxts para puro ASCII, ou garante que são\n"
+"codificadas em UTF-8 desde o princípio, i.e. já nos seus ficheiros-fonte.\n"
+
+#: src/msgl-charset.c:92
+#, c-format
+msgid ""
+"Locale charset \"%s\" is different from\n"
+"input file charset \"%s\".\n"
+"Output of '%s' might be incorrect.\n"
+"Possible workarounds are:\n"
+msgstr ""
+"O conjunto de caracteres local \"%s\" é diferente do\n"
+"conjunto de caracteres \"%s\".do ficheiro de entrada.\n"
+"A saída de \"%s\" poderá ser incorrecta.\n"
+"Possíveis formas de contornar a situação:\n"
+
+#: src/msgl-charset.c:99
+#, c-format
+msgid "- Set LC_ALL to a locale with encoding %s.\n"
+msgstr "- definir LC_ALL como um idioma com codificação %s.\n"
+
+#: src/msgl-charset.c:104
+#, c-format
+msgid ""
+"- Convert the translation catalog to %s using 'msgconv',\n"
+"  then apply '%s',\n"
+"  then convert back to %s using 'msgconv'.\n"
+msgstr ""
+"- converter o catálogo de tradução para %s com \"msgconv\",\n"
+"  e depois aplicar \"%s\", seguido de nova\n"
+"  conversão %s com \"msgconv\".\n"
+
+#: src/msgl-charset.c:113
+#, c-format
+msgid ""
+"- Set LC_ALL to a locale with encoding %s,\n"
+"  convert the translation catalog to %s using 'msgconv',\n"
+"  then apply '%s',\n"
+"  then convert back to %s using 'msgconv'.\n"
+msgstr ""
+"- definir LC_ALL como um idioma com codificação %s,\n"
+"  converter o catálogo de tradução para %s com \"msgconv\",\n"
+"  e depois aplicar \"%s\", seguido de nova\n"
+"  conversão %s com \"msgconv\".\n"
+
+#: src/msgl-charset.c:127
+#, c-format
+msgid ""
+"Locale charset \"%s\" is not a portable encoding name.\n"
+"Output of '%s' might be incorrect.\n"
+"A possible workaround is to set LC_ALL=C.\n"
+msgstr ""
+"O conjunto de caracteres local \"%s\" não é um nome de codificação "
+"portátil.\n"
+"A saída de \"%s\" poderá ser incorrecta. Poderá contornar\n"
+"a situação definindo LC_ALL=C\n"
+
+#: src/msgl-check.c:134
+msgid "plural expression can produce negative values"
+msgstr "a expressão plural poderá produzir valores negativos"
+
+#: src/msgl-check.c:145
+#, c-format
+msgid "nplurals = %lu but plural expression can produce values as large as %lu"
+msgstr ""
+"nplurals = %lu mas a expressão plural poderá produzir valores tão grandes "
+"como %lu"
+
+#: src/msgl-check.c:191
+msgid "plural expression can produce division by zero"
+msgstr "a expressão plural poderá produzir divisões por zero"
+
+#: src/msgl-check.c:196
+msgid "plural expression can produce integer overflow"
+msgstr "a expressão plural poderá produzir transporte de inteiros"
+
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"a expressão plural poderá produzir excepções aritméticas, possivelmente "
+"divisão por zero"
+
+#: src/msgl-check.c:270
+#, c-format
+msgid "Try using the following, valid for %s:"
+msgstr "Tente usar o seguinte, válido para %s:"
+
+#: src/msgl-check.c:362 src/msgl-check.c:386
+msgid "message catalog has plural form translations"
+msgstr "o catálogo de mensagens tem traduções da forma plural"
+
+#: src/msgl-check.c:364
+msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgstr "mas o cabeçalho tem o atributo \"plural=EXPRESSÃO\" em falta"
+
+#: src/msgl-check.c:388
+msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgstr "mas o cabeçalho tem o atributo \"nplurals=INTEIRO\" em falta"
+
+#: src/msgl-check.c:424
+msgid "invalid nplurals value"
+msgstr "vlaor nplurals inválido"
+
+#: src/msgl-check.c:446
+msgid "invalid plural expression"
+msgstr "expressão plural inválida"
+
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, c-format
+msgid "nplurals = %lu"
+msgstr "nplurals = %lu"
+
+#: src/msgl-check.c:478
+#, c-format
+msgid "but some messages have only one plural form"
+msgid_plural "but some messages have only %lu plural forms"
+msgstr[0] "mas algumas mensagens têm apenas uma forma plural"
+msgstr[1] "mas algumas mensagens têm apenas %lu formas plurais"
+
+#: src/msgl-check.c:494
+#, c-format
+msgid "but some messages have one plural form"
+msgid_plural "but some messages have %lu plural forms"
+msgstr[0] "mas algumas mensagens têm uma forma plural"
+msgstr[1] "mas algumas mensagens têm %lu formas plurais"
+
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"o catálogo de mensagens tem traduções de formas plurais, mas falta uma "
+"entrada de cabeçalho com \"Plural-Forms: nplurals=INTEIRO; plural=EXPRESSÃO;"
+"\""
+
+#: src/msgl-check.c:616
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+msgstr "as entradas \"msgid\" e \"msgid_plural\" não começam ambas por \"\\n\""
+
+#: src/msgl-check.c:623
+#, c-format
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "as entradas \"msgid\" e \"msgstr[%u]\" não começam ambas por \"\\n\""
+
+#: src/msgl-check.c:639
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+msgstr "as entradas \"msgid\" e \"msgstr\" não começam ambas por \"\\n\""
+
+#: src/msgl-check.c:657
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"as entradas \"msgid\" e \"msgid_plural\" não terminam ambas por \"\\n\""
+
+#: src/msgl-check.c:664
+#, c-format
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+msgstr "as entradas \"msgid\" e \"msgstr[%u]\" não terminam ambas por \"\\n\""
+
+#: src/msgl-check.c:680
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+msgstr "as entradas \"msgid\" e \"msgstr\" não terminam ambas por \"\\n\""
+
+#: src/msgl-check.c:692
+msgid "plural handling is a GNU gettext extension"
+msgstr "a gestão de plurais é uma extensão GNU gettext"
+
+#: src/msgl-check.c:733
+#, c-format
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr "msgstr tem a marca de acelerador \"%c\" em falta"
+
+#: src/msgl-check.c:744
+#, c-format
+msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgstr "msgstr tem demasiados marcas de acelerador \"%c\""
+
+#: src/msgl-check.c:818
+#, c-format
+msgid "header field '%s' still has the initial default value\n"
+msgstr "o campo de cabeçalho \"%s\" ainda tem o valor inicial predefinido\n"
+
+#: src/msgl-check.c:835
+#, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "campo \"%s\" em falta no cabeçalho\n"
+
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr "Reticências ASCII (\"...\") em vez de Unicode"
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr "espaço antes das reticências em cadeias visíveis pelo utilizador"
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr "usadas aspas duplas ASCII em vez de UNICODE"
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr "usadas aspas simples ASCII em vez de UNICODE"
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "marca ASCII (\"%c\") em vez de Unicode"
+
+#: src/msgl-iconv.c:65
+#, c-format
+msgid "%s: input is not valid in \"%s\" encoding"
+msgstr "%s: entrada inválida em codificação \"%s\""
+
+#: src/msgl-iconv.c:69
+#, c-format
+msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "%s: erro ao converter da codificação \"%s\" para a codificação \"%s\""
+
+#: src/msgl-iconv.c:288
+msgid "input file doesn't contain a header entry with a charset specification"
+msgstr ""
+"ficheiro de entrada sem especificação de conjunto de caracteres no cabeçalho"
+
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
+#, c-format
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Impossível converter de \"%s\" para \"%s\". %s depende de iconv() e iconv() "
+"não suporta esta conversão."
+
+#: src/msgl-iconv.c:330
+#, c-format
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Conversão de \"%s\" para \"%s\" introduz duplicados: algumas msgids "
+"diferentes tornam-se iguais."
+
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
+#, c-format
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Impossível converter de \"%s\" para \"%s\". %s depende de iconv(). Esta "
+"versão foi compilada sem iconv()."
+
+#: src/msgmerge.c:426 src/msgmerge.c:432
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s só é válido com %s"
+
+#: src/msgmerge.c:508
+msgid "backup type"
+msgstr "tipo de segurança"
+
+#: src/msgmerge.c:545
+#, c-format, no-wrap
 msgid ""
-"\n"
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
-"existing PO file with the old translations which will be taken over to\n"
-"the newly created file as long as they still match; comments will be\n"
-"preserved, but extract comments and file positions will be discarded.\n"
-"The ref.po file is the last created PO file (generally by xgettext), any\n"
-"translations or comments in the file will be discarded, however dot\n"
+"existing PO file with translations which will be taken over to the newly\n"
+"created file as long as they still match; comments will be preserved,\n"
+"but extracted comments and file positions will be discarded.  The ref.pot\n"
+"file is the last created PO file with up-to-date source references but\n"
+"old translations, or a PO Template file (generally created by xgettext);\n"
+"any translations or comments in the file will be discarded, however dot\n"
 "comments and file positions will be preserved.  Where an exact match\n"
-"cannot be found, fuzzy matching is used to produce better results.  The\n"
-"results are written to stdout unless an output file is specified.\n"
+"cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"\n"
-"Combina 2 ficheiros .po do tipo Uniforum num s�. O ficheiro def.po\n"
-"dever� ser um ficheiro PO existente com as tradu��es a manter no novo\n"
-"ficheiro criado, desde que ainda aplic�veis; os coment�rios ser�o\n"
-"mantidos, mas os coment�rios relativos � extra��o das mensagens e das\n"
-"suas posi��es nos ficheiros ser�o eliminados. O ficheiro ref.po dever�\n"
-"ser o �ltimo ficheiro PO criado (geralmente pelo xgettext); todas as\n"
-"tradu��es e coment�rios neste ficheiro ser�o eliminados, sendo\n"
-"preservados os coment�rios e as posi��es nos ficheiros. Quando um\n"
-"emparelhamento exacto n�o puder ser efectuado � efectuado um\n"
-"emparelhamento aproximado para produzir melhores resultados. Os\n"
-"resultados ser�o escritos no canal de sa�da por defeito (stdout) a\n"
-"menos que seja especificado um ficheiro de sa�da.\n"
+"Combina dois ficheiros PO estilo Uniforum num só. O ficheiro def.po é um\n"
+"ficheiro PO existente com as traduções a manter no novo ficheiro criado,\n"
+"desde que ainda correspondam; os comentários serão mantidos, mas os comentários\n"
+"extraídos e as posições nos ficheiros serão eliminados. O ficheiro ref.pot\n"
+"é o último ficheiro PO criado com referências-fonte actualizadas mas traduções\n"
+"antigas, ou um ficheiro PO Template (geralmente gerado pelo xgettext); todas \n"
+"as traduções e comentários serão eliminados, sendo preservados os comentários\n"
+"e as posições nos ficheiros. Quando não for encontrada uma correspondência \n"
+"exacta, é usada correspondência aproximada para produzir melhores resultados.\n"
+
+#: src/msgmerge.c:562
+#, c-format
+msgid "  def.po                      translations referring to old sources\n"
+msgstr "  def.po                      traduções referentes a fontes antigas\n"
+
+#: src/msgmerge.c:564
+#, c-format
+msgid "  ref.pot                     references to new sources\n"
+msgstr "  ref.pot                     referências a novas fontes\n"
+
+#: src/msgmerge.c:568
+#, c-format
+msgid ""
+"  -C, --compendium=FILE       additional library of message translations,\n"
+"                              may be specified more than once\n"
+msgstr ""
+"  -C, --compendium=FICHEIRO   biblioteca adicional de tradução de "
+"mensagens,\n"
+"                              pode ser especificada mais de uma vez\n"
+
+#: src/msgmerge.c:574
+#, c-format
+msgid ""
+"  -U, --update                update def.po,\n"
+"                              do nothing if def.po already up to date\n"
+msgstr ""
+"  -U, --update                actualiza def.po,\n"
+"                              não faz nada se def.po já estiver actualizado\n"
+
+#: src/msgmerge.c:586
+#, c-format
+msgid "Output file location in update mode:\n"
+msgstr "Localização do ficheiro de saída em modo de actualização:\n"
+
+#: src/msgmerge.c:588
+#, c-format
+msgid "The result is written back to def.po.\n"
+msgstr "O resultado é escrito de novo em def.po\n"
+
+#: src/msgmerge.c:590
+#, c-format
+msgid "      --backup=CONTROL        make a backup of def.po\n"
+msgstr "      --backup=CONTROL        faz uma segurança de def.po\n"
+
+#: src/msgmerge.c:592
+#, c-format
+msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
+msgstr ""
+"      --suffix=SUFFIX         sobrescreve o sufixo habitual de seguranças\n"
 
-#: src/msgmerge.c:772
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
+"the VERSION_CONTROL environment variable.  Here are the values:\n"
+"  none, off       never make backups (even if --backup is given)\n"
+"  numbered, t     make numbered backups\n"
+"  existing, nil   numbered if numbered backups exist, simple otherwise\n"
+"  simple, never   always make simple backups\n"
 msgstr ""
-"%sLidas %d antigas + %d refer�ncias, combinadas %d, aproximadas %d, faltam "
-"%d, obsoletas %d.\n"
+"O método de controlo de versão pode ser seleccionado via opção --backup ou "
+"com\n"
+"a variável de ambiente VERSION_CONTROL. Eis os valores:\n"
+"  none, off       nunca faz seguranças (mesmo que --backup seja dada)\n"
+"  numbered, t     faz seguranças numeradas\n"
+"  existing, nil   numeradas se existirem seguranças numeradas, senão "
+"simples\n"
+"  simple, never   faz sempre seguranças simples\n"
 
-#: src/msgmerge.c:778
+#: src/msgmerge.c:601
+#, c-format
+msgid ""
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
+"environment variable.\n"
+msgstr ""
+"O sufixo da segurança é sempre \"~\", a não ser que definido por --suffix ou "
+"na \n"
+"variável de ambiente SIMPLE_BACKUP_SUFFIX\n"
+
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 reconhece cadeias de formato Boost\n"
+
+#: src/msgmerge.c:615
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              mantém msgids anteriores das mensagens "
+"traduzidas\n"
+
+#: src/msgmerge.c:672 src/urlget.c:191
+#, c-format
+msgid "  -q, --quiet, --silent       suppress progress indicators\n"
+msgstr "  -q, --quiet, --silent       suprime indicadores de progresso\n"
+
+#: src/msgmerge.c:1685
+#, c-format
+msgid "this message should define plural forms"
+msgstr "esta mensagem deve definir formas plurais"
+
+#: src/msgmerge.c:1706
+#, c-format
+msgid "this message should not define plural forms"
+msgstr "esta mensagem não deve definir formas plurais"
+
+#: src/msgmerge.c:2110
+#, c-format
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLidas %ld antigas + %ld referências, unidas %ld, aproximadas %ld, faltam "
+"%ld, obsoletas %ld.\n"
+
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
-msgstr "terminado.\n"
+msgstr " concluído.\n"
 
-#: src/msgunfmt.c:215
-#, fuzzy, c-format, no-wrap
+#: 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 nomes de ficheiro explícitos são mutuamente exclusivos"
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid "Usage: %s [OPTION] [FILE]...\n"
+msgstr "Uso: %s [OPÇÃO] [FICHEIRO]...\n"
+
+#: src/msgunfmt.c:431
+#, c-format
+msgid "Convert binary message catalog to Uniforum style .po file.\n"
+msgstr ""
+"Converter catálogo de mensagens binário para ficheiro PO estilo Uniforum.\n"
+
+#: src/msgunfmt.c:440
+#, c-format
 msgid ""
-"Usage: %s [OPTION] [FILE]...\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -e, --no-escape          do not use C escapes in output (default)\n"
-"  -E, --escape             use C escapes in output, no extended chars\n"
-"      --force-po           write PO file even if empty\n"
-"  -h, --help               display this help and exit\n"
-"  -i, --indent             write indented output style\n"
-"  -o, --output-file=FILE   write output into FILE instead of standard output\n"
-"      --strict             write strict uniforum style\n"
-"  -V, --version            output version information and exit\n"
-"  -w, --width=NUMBER       set output page width\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] [FICHEIRO]...\n"
-"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-"obrigat�rios para as op��es curtas.\n"
-"  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
-"                              (op��o por defeito)\n"
-"  -E, --escape                usa sequ�ncias de escape do C na sa�da, n�o\n"
-"                              usando caracteres especiais\n"
-"  -h, --help                  mostra esta ajuda e sai\n"
-"  -i, --indent                usa o modo de sa�da alinhado\n"
-"  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no FICHEIRO\n"
-"                              em vez do canal de sa�da por defeito (stdout)\n"
-"      --strict                usa o modo de sa�da Uniforum estrito\n"
-"  -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/msgunfmt.c:229
-#, no-wrap
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  modo Java: a entrada é uma classe Java "
+"ResourceBundle\n"
+
+#: src/msgunfmt.c:442
+#, c-format
+msgid "      --csharp                C# mode: input is a .NET .dll file\n"
+msgstr ""
+"      --csharp                modo C#: a entrada é um ficheiro .NET .dll\n"
+
+#: src/msgunfmt.c:444
+#, c-format
 msgid ""
-"\n"
-"Convert binary .mo files to Uniforum style .po files.\n"
-"Both little-endian and big-endian .mo files are handled.\n"
-"If no input file is given or it is -, standard input is read.\n"
-"By default the output is written to standard output.\n"
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
-"\n"
-"Converte ficheiros .mo bin�rios em ficheiros .po no modo Uniforum.\n"
-"Ficheiros .mo \"little-endian\" e \"big-endian\" s�o simultaneamente\n"
-"tratados. Se n�o for indicado ficheiro de entrada ou este for -, �\n"
-"usado o canal de entrada stdin. Por defeito a sa�da � escrita no\n"
-"stdout.\n"
+"      --csharp-resources      modo Recursos C#: a entrada é um ficheiro ."
+"NET .resources\n"
 
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/msgunfmt.c:446
 #, c-format
-msgid "error while reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   modo Tcl: a entrada é um ficheiro tcl/msgcat ."
+"msg\n"
 
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:451
 #, c-format
-msgid "file \"%s\" truncated"
-msgstr "ficheiro \"%s\"truncado"
+msgid "  FILE ...                    input .mo files\n"
+msgstr "  FICHEIRO                    a entrada é um FICHEIRO .mo\n"
 
-#: src/msgunfmt.c:298
-#, fuzzy, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "seek \"%s\" offset %ld falhou"
+#: src/msgunfmt.c:456
+#, c-format
+msgid "Input file location in Java mode:\n"
+msgstr "Localização do ficheiro de entrada em modo Java:\n"
 
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:462
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
-msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
+msgid ""
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
+"separated with an underscore.  The class is located using the CLASSPATH.\n"
+msgstr ""
+"O nome da classe é determinado anexando o nome do idioma ao nome do "
+"recurso,\n"
+"separado por um sublinhado. A classe é localizada usando CLASSPATH.\n"
+
+#: src/msgunfmt.c:467
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "Localização do ficheiro de entrada em modo C#\n"
 
-#: ../../src/po-gram.y:83
-msgid "missing `msgstr' section"
-msgstr "falta a sec��o `msgstr'"
+#: 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 ""
+"As opções -l e -d são obrigatórias. O ficheiro .dll está localizado numa\n"
+"sub-pasta da pasta especificada, cujo nome depende do idioma.\n"
 
-#: src/po-lex.c:84
+#: src/msgunfmt.c:479
 #, c-format
-msgid "found %d fatal errors"
-msgstr "encontrados %d erros fatais"
+msgid "Input file location in Tcl mode:\n"
+msgstr "Localização do ficheiro de entrada em modo Tcl\n"
 
-#: src/po-lex.c:129 src/po-lex.c:168
+#: 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 ""
+"As opções -l e -d são obrigatórias. O ficheiro .msg está localizado na\n"
+"pasta especificada.\n"
+
+#: src/msgunfmt.c:511
+#, c-format
+msgid "  -i, --indent                write indented output style\n"
+msgstr "  -i, --indent                escreve em estilo de saída indentado\n"
+
+#: src/msgunfmt.c:513
+#, c-format
+msgid "      --strict                write strict uniforum style\n"
+msgstr ""
+"      --strict                escreve em estilo estritamente Uniforum\n"
+
+#: src/msguniq.c:331
+#, c-format, no-wrap
+msgid ""
+"Unifies duplicate translations in a translation catalog.\n"
+"Finds duplicate translations of the same message ID.  Such duplicates are\n"
+"invalid input for other programs like msgfmt, msgmerge or msgcat.  By\n"
+"default, duplicates are merged together.  When using the --repeated option,\n"
+"only duplicates are output, and all other messages are discarded.  Comments\n"
+"and extracted comments will be cumulated, except that if --use-first is\n"
+"specified, they will be taken from the first translation.  File positions\n"
+"will be cumulated.  When using the --unique option, duplicates are discarded.\n"
+msgstr ""
+"Unifica traduções duplicadas em um catálogo de tradução. Localiza traduções\n"
+"duplicadas da mesma ID de mensagem. Esses duplicados são entrada inválida\n"
+"para outros programas como msgfmt, msgmerge ou msgcat. Por predefinição, os\n"
+"duplicados unidos. Ao usar a opção --repeated, só duplicados são saída e \n"
+"todas as outras mensagens são descartadas. Comentários e comentários extraídos\n"
+"serão acumulados, excepto que se --use-first for especificado, serão retirados\n"
+"da primeira tradução. Posições de ficheiro serão acumuladas. Ao usar a opção\n"
+"--unique, os duplicados são descartados.\n"
+
+#: src/msguniq.c:364
+#, c-format
+msgid "  -d, --repeated              print only duplicates\n"
+msgstr "  -d, --repeated              imprime só duplicados\n"
+
+#: src/msguniq.c:366
+#, c-format
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                imprime só mensagens únicas, descarta "
+"duplicados\n"
+
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+msgid "<stdin>"
+msgstr "<entrada padrão>"
+
+#: src/po-charset.c:489
+#, c-format
+msgid ""
+"Charset \"%s\" is not a portable encoding name.\n"
+"Message conversion to user's charset might not work.\n"
+msgstr ""
+"O conjunto de caracteres \"%s\" não é um nome de codificação portátil. A\n"
+"conversão para o conjunto de caracteres do utilizador poderá não resultar.\n"
+
+#: src/po-charset.c:557
+#, c-format
+msgid ""
+"Charset \"%s\" is not supported. %s relies on iconv(),\n"
+"and iconv() does not support \"%s\".\n"
+msgstr ""
+"Conjunto de caracteres \"%s\" não suportado. %s depende de iconv(),\n"
+"e o iconv() não suporta \"%s\".\n"
+
+#: src/po-charset.c:564 src/po-charset.c:612
+msgid ""
+"Installing GNU libiconv and then reinstalling GNU gettext\n"
+"would fix this problem.\n"
+msgstr ""
+"Instalar GNU libiconv e depois reinstalar o GNU gettext\n"
+"deve resolver o problema.\n"
+
+#: src/po-charset.c:578 src/po-charset.c:616
+msgid "Continuing anyway, expect parse errors."
+msgstr "A continuar na mesma, espere erros de análise."
+
+#: src/po-charset.c:580
+msgid "Continuing anyway."
+msgstr "A continuar na mesma."
+
+#: src/po-charset.c:607
+#, c-format
+msgid ""
+"Charset \"%s\" is not supported. %s relies on iconv().\n"
+"This version was built without iconv().\n"
+msgstr ""
+"Conjunto de caracteres \"%s\" não suportado. %s depende de iconv().\n"
+"Esta versão foi compilada sem o iconv().\n"
+
+#: src/po-charset.c:644
+msgid ""
+"Charset missing in header.\n"
+"Message conversion to user's charset will not work.\n"
+msgstr ""
+"Conjunto de caracteres em falta no cabeçalho. A conversão\n"
+"para o conjunto de caracteres do utilizador não vai resultar.\n"
+
+#: src/po-gram-gen.y:94
+#, c-format
+msgid "inconsistent use of #~"
+msgstr "uso inconsistente de #~"
+
+#: src/po-gram-gen.y:241
+#, c-format
+msgid "missing 'msgstr[]' section"
+msgstr "secção \"msgstr[]\" em falta"
+
+#: src/po-gram-gen.y:250
+#, c-format
+msgid "missing 'msgid_plural' section"
+msgstr "secção \"msgid_plural\" em falta"
+
+#: src/po-gram-gen.y:258
+#, c-format
+msgid "missing 'msgstr' section"
+msgstr "secção \"msgstr\" em falta"
+
+#: src/po-gram-gen.y:397
+#, c-format
+msgid "first plural form has nonzero index"
+msgstr "primeira forma plural tem índice não zero"
+
+#: src/po-gram-gen.y:399
+#, c-format
+msgid "plural form has wrong index"
+msgstr "forma plural com índice errado"
+
+#: src/po-lex.c:90 src/po-lex.c:109
+#, c-format
 msgid "too many errors, aborting"
-msgstr "demasiados erros, interrompendo"
+msgstr "demasiados erros, a abortar"
 
-#: src/po-lex.c:241
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
+#, c-format
+msgid "invalid multibyte sequence"
+msgstr "sequência multi-byte inválida"
+
+#: src/po-lex.c:465
+#, c-format
+msgid "incomplete multibyte sequence at end of file"
+msgstr "sequência multi-byte incompleta no fim do ficheiro"
+
+#: src/po-lex.c:474
+#, c-format
+msgid "incomplete multibyte sequence at end of line"
+msgstr "sequência multi-byte incompleta no fim da linha"
+
+#: src/po-lex.c:485
+msgid "iconv failure"
+msgstr "iconv falhou"
+
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:332
-msgid "illegal control sequence"
-msgstr "sequ�ncia de controlo ilegal"
+#: src/po-lex.c:852
+#, c-format
+msgid "invalid control sequence"
+msgstr "sequência de controlo inválida"
+
+#: src/po-lex.c:979
+#, c-format
+msgid "end-of-file within string"
+msgstr "fim-de-ficheiro dentro da cadeia"
 
-#: src/po-lex.c:415
+#: src/po-lex.c:985
+#, c-format
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/po-lex.c:420
-msgid "end-of-file within string"
-msgstr "fim-de-ficheiro dentro da cadeia"
+#: src/po-lex.c:1006
+#, c-format
+msgid "context separator <EOT> within string"
+msgstr "separador de contexto <EOT> dentro da cadeia"
 
-#: src/xget-lex.c:150
-msgid "standard input"
-msgstr "entrada standard"
+#: src/read-catalog.c:325 src/xgettext.c:1228
+#, 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:370
+msgid "duplicate message definition"
+msgstr "definição de mensagem duplicada"
+
+#: src/read-catalog.c:372
+msgid "this is the location of the first definition"
+msgstr "este é o local da primeira definição"
 
-#: src/xget-lex.c:892
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr "nome de grupo por terminar"
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr "carácter não-branco inválido"
+
+#: src/read-desktop.c:405
 #, c-format
-msgid "%s:%d: warning: unterminated character constant"
+msgid "missing '=' after \"%s\""
+msgstr "\"=\" em falta após \"%s\""
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "linha não-branca inválida"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
+#, c-format
+msgid "file \"%s\" is truncated"
+msgstr "ficheiro \"%s\"truncado"
+
+#: src/read-mo.c:132
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "o ficheiro \"%s\" contém uma cadeia não terminada em NUL"
+
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "o ficheiro \"%s\" contém uma cadeia não terminada em NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
+#, c-format
+msgid "file \"%s\" is not in GNU .mo format"
+msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
+
+#: src/read-mo.c:197
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated string, at %s"
+msgstr "o ficheiro \"%s\" contém uma cadeia não terminada em NUL, em %s"
+
+#: src/read-properties.c:357
+msgid "warning: invalid \\uxxxx syntax for Unicode character"
+msgstr "aviso: sintaxe \\uxxxx inválida para carácter Unicode"
+
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: aviso: substituto sozinho U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "aviso: carácter Unicode inválido"
+
+#: src/read-stringtable.c:802
+msgid "warning: unterminated string"
+msgstr "aviso: cadeia indeterminada"
+
+#: src/read-stringtable.c:810
+msgid "warning: syntax error"
+msgstr "aviso: erro de sintaxe"
+
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
+msgid "warning: unterminated key/value pair"
+msgstr "aviso: par chave/valor não terminado"
+
+#: src/read-stringtable.c:940
+msgid "warning: syntax error, expected ';' after string"
+msgstr "aviso: erro de sintaxe. esperado \";\" após a cadeia"
+
+#: src/read-stringtable.c:948
+msgid "warning: syntax error, expected '=' or ';' after string"
+msgstr "aviso: erro de sintaxe, esperado \"=\" ou \";\" após a cadeia"
+
+#: src/recode-sr-latin.c:115
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Escrito por %s e %s.\n"
+
+#. TRANSLATORS: This is a proper name. The last name is
+#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
+#. "&Scaron;egan".
+#. This is a proper name. See the gettext manual, section Names.
+#: src/recode-sr-latin.c:119
+msgid "Danilo Segan"
+msgstr "Danilo Segan"
+
+#: src/recode-sr-latin.c:152
+#, c-format, no-wrap
+msgid "Recode Serbian text from Cyrillic to Latin script.\n"
+msgstr "Recodificar texto sérvio de cirílico para latim.\n"
+
+#: src/recode-sr-latin.c:155
+#, c-format, no-wrap
+msgid ""
+"The input text is read from standard input.  The converted text is output to\n"
+"standard output.\n"
+msgstr ""
+"O texto de entrada é lido da entrada padrão. O texto convertido é imprimido na\n"
+"saída padrão.\n"
+
+#: src/recode-sr-latin.c:335
+#, c-format
+msgid "input is not valid in \"%s\" encoding"
+msgstr "entrada inválida na codificação \"%s\""
+
+#: src/recode-sr-latin.c:363
+#, c-format
+msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "erro ao converter da codificação \"%s\" para codificação \"%s\""
+
+#: src/urlget.c:158
+#, c-format
+msgid "expected two arguments"
+msgstr "esperados dois argumentos"
+
+#: src/urlget.c:175
+#, c-format
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr "Uso: %s [OPÇÃO] URL FICHEIRO\n"
+
+#: src/urlget.c:180
+#, 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 "Obtém e imprime o conteúdo de um URL. Se o URL não puder ser acedido, será usado o ficheiro localmente acessível.\n"
+
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "erro ao ler \"%s\""
+
+#: src/urlget.c:233
+#, c-format
+msgid "error writing stdout"
+msgstr "erro ao escrever na saída padrão"
+
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "erro após ler \"%s\""
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr "A obter %s..."
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr " expirou.\n"
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr " falhou.\n"
+
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Impossível imprimir múltiplos domínios de tradução num só ficheiro com o "
+"formato especificado. Tente usar a sintaxe PO."
+
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Impossível imprimir múltiplos domínios de tradução num só ficheiro com o "
+"formato de saída especificado."
+
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"O catálogo de mensagens tem traduções dependentes do contexto, mas o formato "
+"de saída não as suporta."
+
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"O catálogo de mensagens tem traduções com formas plurais, mas o formato de "
+"saída não as suporta. Tente gerar uma classe Java com \"msgfmt --java\", em "
+"vexz de um ficheiro .properties"
+
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"O catálogo de mensagens com traduções com formas plurais, mas o formato de "
+"saída não as suporta."
+
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
+#, 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:282
+msgid "standard output"
+msgstr "saída padrão"
+
+#: src/write-csharp.c:708
+#, c-format
+msgid "failed to create directory \"%s\""
+msgstr "falha ao criar a pasta \"%s\""
+
+#: src/write-csharp.c:771
+#, c-format
+msgid "compilation of C# class failed, please try --verbose"
+msgstr "falha ao compilar a classe C#, por favor tente --verbose"
+
+#: src/write-csharp.c:773
+#, c-format
+msgid "compilation of C# class failed"
+msgstr "falha ao compilar a classe C#"
+
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "erro ao abrir \"%s\" para escrita"
+
+#: src/write-java.c:1096
+#, c-format
+msgid "not a valid Java class name: %s"
+msgstr "nome de classe Java inválido: %s"
+
+#: src/write-java.c:1216
+#, c-format
+msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgstr ""
+"falha ao compilar a classe Java, por favor tente --verbose ou defina $JAVAC"
+
+#: src/write-java.c:1219
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr "falha ao compilar a classe Java, por favor tente definir $JAVAC"
+
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "sequência multi-byte incompleta"
+
+#: src/write-po.c:884
+#, c-format
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"as mensagens de internacionalização não devem conter a sequência de escape "
+"\"\\%c\""
+
+#: src/write-po.c:1334 src/write-po.c:1502
+#, c-format
+msgid ""
+"The following msgctxt contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgctxt instead.\n"
+"%s\n"
+msgstr ""
+"a msgctxt seguinte contém caracteres não-ASCII.\n"
+"Vai causar problemas a tradutores que usem uma codificação\n"
+"diferente da sua. Considere usar uma msgctxt ASCII pura ao invés.\n"
+"%s\n"
+
+#: src/write-po.c:1346 src/write-po.c:1514
+#, c-format
+msgid ""
+"The following msgid contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgid instead.\n"
+"%s\n"
+msgstr ""
+"a msgid seguinte contém caracteres não-ASCII.\n"
+"Vai causar problemas a tradutores que usem uma codificação\n"
+"diferente da sua. Considere usar uma msgid ASCII pura ao invés.\n"
+"%s\n"
+
+#: src/write-qt.c:668
+msgid ""
+"message catalog has plural form translations\n"
+"but the Qt message catalog format doesn't support plural handling\n"
+msgstr ""
+"o catálogo de mensagens tem traduções com formas plurais mas o\n"
+"formato de catálogos de mensagens QT não suporta a gestão de plurais\n"
+
+#: src/write-qt.c:694
+msgid ""
+"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 ""
+"o catálogo de mensagens tem cadeias msgctxt com caracteres fora de "
+"ISO-8859-1,\n"
+"mas o formato de catálogos de mensagens QT só suporta Unicode nas cadeias\n"
+"traduzidas, não nas cadeias de contexto\n"
+
+#: src/write-qt.c:718
+msgid ""
+"message catalog has msgid 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 untranslated strings\n"
+msgstr ""
+"o catálogo de mensagens tem cadeias msgid com caracteres fora de "
+"ISO-8859-1,\n"
+"mas o formato de catálogos de mensagens QT só suporta Unicode nas cadeias\n"
+"traduzidas, não nas cadeias por traduzir\n"
+
+#: src/write-resources.c:96
+#, c-format
+msgid "error while writing to %s subprocess"
+msgstr "erro ao escrever no sub-processo %s"
+
+#: src/write-resources.c:133
+msgid ""
+"message catalog has context dependent translations\n"
+"but the C# .resources format doesn't support contexts\n"
+msgstr ""
+"o catálogo de mensagens tem traduções dependentes do contexto\n"
+"mas o formato C# .resources não suporta contextos\n"
+
+#: src/write-resources.c:152
+msgid ""
+"message catalog has plural form translations\n"
+"but the C# .resources format doesn't support plural handling\n"
 msgstr ""
+"o catálogo de mensagens tem traduções com formas plurais\n"
+"mas o formato C# .resources não suporta contextos\n"
+
+#: src/write-tcl.c:159
+msgid ""
+"message catalog has context dependent translations\n"
+"but the Tcl message catalog format doesn't support contexts\n"
+msgstr ""
+"o catálogo de mensagens tem traduções dependentes do contexto\n"
+"mas o formato de catálogo Tcl não suporta contextos\n"
+
+#: src/write-tcl.c:178
+msgid ""
+"message catalog has plural form translations\n"
+"but the Tcl message catalog format doesn't support plural handling\n"
+msgstr ""
+"o catálogo de mensagens tem traduções com formas plurais\n"
+"mas o formato de catálogo Tcl não suporta a gestão de plurais\n"
+
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
+#, c-format
+msgid "%s:%d: warning: unterminated string"
+msgstr "%s:%d: aviso: cadeia não terminada"
+
+#: src/x-awk.c:591
+#, c-format
+msgid "%s:%d: warning: unterminated regular expression"
+msgstr "%s:%d: aviso: expressão regular não terminada"
+
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: aviso: carácter Unicode inválido"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: aviso: literal de cadeia não terminal"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: aviso: literal de cadeia não terminal"
 
-#: src/xget-lex.c:914
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: aviso: literal de cadeia não terminal"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
+#, c-format
+msgid "%s:%d: warning: unterminated character constant"
+msgstr "%s:%d: aviso: constante de carácter não terminada"
+
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
+msgstr "%s:%d: aviso: literal de cadeia não terminal"
+
+#: src/x-csharp.c:225
+msgid "Please specify the source encoding through --from-code."
+msgstr "Por favor, especifique a codificação da fonte com --from-code."
+
+#: 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 ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: 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 ""
+"%s:%d: sequência longa multi-byte inválida.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: 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 ""
+"%s:%d: sequência multi-byte incompleta no fim do ficheiro.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: 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 ""
+"%s:%d: sequência multi-byte incompleta no fim da linha.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
+#, c-format
+msgid "%s:%d: iconv failure"
+msgstr "%s:%d: iconv falhou"
+
+#: src/x-csharp.c:338
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code.\n"
+msgstr ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação da fonte com --from-code.\n"
+
+#: src/x-csharp.c:1451 src/x-java.c:668
+#, c-format
+msgid "%s:%d: warning: unterminated string constant"
+msgstr "%s:%d: aviso: constante de cadeia não terminada"
+
+#: src/x-csharp.c:1953 src/x-java.c:1153
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr "%s:%d: aviso: obtido \")\", esperado \"}\""
 
-#: src/xgettext.c:386
+#: src/x-csharp.c:1983 src/x-java.c:1183
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr "%s:%d: aviso: obtido \"}\", esperado \")\""
+
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr "\"%s\" não é um nome de codificação válido. A usar ASCII.\n"
+
+#: src/xgettext.c:637
+#, c-format
+msgid "syntax check '%s' unknown"
+msgstr "teste de sintaxe \"%s\" desconhecido"
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr "tipo de fim de frase \"%s\" desconhecido"
+
+#: src/xgettext.c:701
+#, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
+msgstr "impossível usar --join-existing quando a saída vai para a saída padrão"
+
+#: src/xgettext.c:705
+#, c-format
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext não funciona sem palavras para procurar"
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr "aviso: ficheiro de regras ITS \"%s\" não existe"
+
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"aviso: ficheiro de regras ITS \"%s\" não existe; verifique a sua instalação "
+"de gettext"
+
+#: src/xgettext.c:938
+#, c-format
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgstr ""
+"aviso: ficheiro \"%s\" com a extensão \"%s\" desconhecido;\n"
+"será tentado C"
+
+#: src/xgettext.c:1027
+#, c-format
+msgid "Extract translatable strings from given input files.\n"
+msgstr "Extrair cadeias traduzíveis de ficheiros de entrada indicados.\n"
+
+#: src/xgettext.c:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
-"--join-existing n�o pode ser usada quando a sa�da\n"
-"� escrita no stdout"
+"  -d, --default-domain=NOME   usa NOME.po para saída (em vez de messages."
+"po)\n"
 
-#: src/xgettext.c:501
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr "  -o, --output=FICHEIRO       escreve a saída em FICHEIRO\n"
+
+#: src/xgettext.c:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=PASTA      os ficheiros de saída são postos em PASTA\n"
+
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Escolha da linguagem do ficheiro de entrada:\n"
+
+#: src/xgettext.c:1061
 #, fuzzy, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"cuidado: o tipo do ficheiro `%s' com a extens�o `%s' � desconhecido;\n"
-"ser� tentado C"
+"  -L, --language=NOME         reconhece a linguagem especificada\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:537
-#, fuzzy, c-format, no-wrap
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++                   atalho para --language=C++\n"
+
+#: src/xgettext.c:1070
+#, c-format
 msgid ""
-"Usage: %s [OPTION] INPUTFILE ...\n"
-"Extract translatable string from given input files.\n"
-"\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -a, --extract-all              extract all strings\n"
-"  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
-"                                 preceding keyword lines) in output file\n"
-"  -C, --c++                      shorthand for --language=C++\n"
-"      --debug                    more detailed formatstring recognision result\n"
-"  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-"  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-"  -e, --no-escape                do not use C escapes in output (default)\n"
-"  -E, --escape                   use C escapes in output, no extended chars\n"
-"  -f, --files-from=FILE          get list of input files from FILE\n"
-"      --force-po                 write PO file even if empty\n"
-"      --foreign-user             omit FSF copyright in output for foreign user\n"
-"  -F, --sort-by-file             sort output by file location\n"
-msgstr ""
-"Utiliza��o: %s [OP��O] FICHEIRODEENTRADA...\n"
-"Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
-"obrigat�rios para as op��es curtas.\n"
-"  -a, --extract-all              extrai todas as cadeias\n"
-"  -c, --add-comments[=TAG]       coloca o bloco comentado com TAG (ou as\n"
-"                                 linhas de cabe�alho precedentes) no ficheiro\n"
-"                                 de sa�da.\n"
-"  -C, --c++                      reconhece coment�rios do tipo C++\n"
-"      --debug                    produz resultados mais detalhados do\n"
-"                                 reconhecimento das cadeias de formata��o\n"
-"  -d, --default-domain=NOME      usa NOME.po para a sa�da (em vez de\n"
-"                                 messages.po)\n"
-"  -D, --directory=DIRECT�RIO     adiciona DIRECT�RIO � lista de procura para\n"
-"   \"                             os ficheiros de entrada\n"
-"  -e, --no-escape                n�o usa sequ�ncias de escape do C na sa�da\n"
-"                                 (op��o por defeito)\n"
-"  -E, --escape                   usa sequ�ncias de escape do C na sa�da, n�o\n"
-"                                 usando caracteres especiais\n"
-"  -f, --files-from=FICHEIRO      obt�m lista de ficheiros de entrada de\n"
-"                                 FICHEIRO\n"
-"      --force-po                 escreve o ficheiro PO mesmo se este estiver\n"
-"                                 vazio\n"
-"  -F, --sort-by-file             ordena a sa�da pela localiza��o dos ficheiros\n"
-
-#: src/xgettext.c:557
-#, fuzzy, c-format, no-wrap
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Por predefinição, a linguagem é adivinhada através do nome da extensão.\n"
+
+#: src/xgettext.c:1075
+#, c-format
 msgid ""
-"  -h, --help                     display this help and exit\n"
-"  -i, --indent                   write the .po file using indented style\n"
-"  -j, --join-existing            join messages with existing file\n"
-"  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
-"                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
-"  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-"                                 otherwise is guessed from file extension\n"
-"  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-"  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
-"      --no-location              do not write '#: filename:line' lines\n"
-msgstr ""
-" -h, --help                     mostra esta ajuda e sai\n"
-" -i, --indent                   escreve o ficheiro .po usando o modo de\n"
-"                                sa�da alinhado\n"
-" -j, --join-existing            combina as mensagens com o ficheiro existente\n"
-" -k, --keyword[=PALAVRA]        palavra chave adicional a ser procurada\n"
-"                                (sem PALAVRA significa n�o usar as palavras\n"
-"                                chave por defeito)\n"
-" -l, --string-limit=N�MERO      especifica o tamanho m�ximo das cadeias como\n"
-"                                N�MERO, em vez de %u\n"
-" -m, --msgstr-prefix[=CADEIA]   usa CADEIA or \"\" como prefixo para os\n"
-"                                campos `msgstr'\n"
-" -M, --msgstr-suffix[=STRING]   usa CADEIA ou \"\" como sufixo para as cadeias\n"
-"                                `msgstr'\n"
-"     --no-location              n�o escreve linhas do tipo '#: filename:line'\n"
-
-#: src/xgettext.c:571
-#, fuzzy, no-wrap
-msgid ""
-"  -n, --add-location             generate '#: filename:line' lines (default)\n"
-"      --omit-header              don't write header with `msgid \"\"' entry\n"
-"  -o, --output=FILE              write output to specified file\n"
-"  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-"  -s, --sort-output              generate sorted output and remove duplicates\n"
-"      --strict                   write out strict Uniforum conforming .po file\n"
-"  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-"  -V, --version                  output version information and exit\n"
-"  -w, --width=NUMBER             set output page width\n"
-"  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
-"\n"
-"If INPUTFILE is -, standard input is read.\n"
-msgstr ""
-" -n, --add-location             gera linhas do tipo '#: filename:line'\n"
-"                                (op��o utilizada por defeito)\n"
-"     --omit-header              n�o escreve cabe�alhos com campos `msgid\"\"'\n"
-" -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
-"                                direct�rio DIR\n"
-" -s, --sort-output              gera resultados ordenados, removendo os\n"
-"                                duplicados\n"
-"     --strict                   escreve um ficheiro .po de acordo com o\n"
-"                                modo Uniforum estrito\n"
-" -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
-" -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"
-" -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
-"\n"
-"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
-"usado.\n"
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=NOME        codificação dos ficheiros de entrada\n"
+"                                (excepto para Python, Tcl, Glade)\n"
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr ""
+"Por predefinição, assume-se que os ficheiros de entrada estão em ASCII.\n"
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr "  -j, --join-existing         une mensagens com o ficheiro existente\n"
+
+#: src/xgettext.c:1085
+#, c-format
+msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
+msgstr "  -x, --exclude-file=FICH.po  entradas de FICH.po não são extraídas.\n"
+
+#: src/xgettext.c:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cTAG, --add-comments=ROT   põe blocos de comentário começados por ROT e\n"
+"                                precedendo linhas de palavras-chave no "
+"ficheiro de saída\n"
+"  -c, --add-comments          põe blocos de comentário precedendo linhas de\n"
+"                                palavras-chave no ficheiro de saída\n"
+
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+"      --check=NAME            realiza teste de sintaxe em mensagens\n"
+"                                (reticências-unicode, espaço-reticências,\n"
+"                                 aspas-unicode, marca-unicode)\n"
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+"      --sentence-end=TIPO     tipo que descreve o fim da frase\n"
+"                                (espaço único, que é a predefinição, \n"
+"                                 ou espaço duplo)\n"
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Opções específicas da linguagem:\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           extrai todas as cadeias\n"
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (só linguagens C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (só linguagens C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=PALV:ARG:BAND    bandeira adicional para cadeias dentro do "
+"argumento\n"
+"                              número ARG da palavra PALV\n"
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (só linguagens C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr ""
+"  -T, --trigraphs             compreende tri-grafos ANSI C para entrada\n"
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (só linguagens C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FICHEIRO          aplica regras ITS de FICHEIRO\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (só linguagens baseadas em XML)\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    reconhece cadeias de formato Qt\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (só linguagem C++)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   reconhece cadeias de formato KDE 4\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 reconhece cadeias de formato Boost\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 resultado de reconhecimento de cadeias de "
+"fomato mais detalhado\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     escreve um ficheiro Java .properties\n"
 
-#: src/xgettext.c:1344
+#: src/xgettext.c:1175
 #, c-format
-msgid "language `%s' unknown"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --itstool               escreve comentários itstool\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr "      --copyright-holder=CADEIA  define direitos de autor na saída\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          omite direitos de autor da FSF na saída para "
+"utilizadores estrangeiros\n"
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PACOTE   define o nome do pacote na saída\n"
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSÃO   define a versão do pacote na saída\n"
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@EXEMPLO  define endereço de email para "
+"reportar erros de msgid\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[CADEIA], --msgstr-prefix[=CADEIA]  usa CADEIA ou \"\" como prefixo para "
+"valores\n"
+"                                msgstr\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[CADEIA], --msgstr-suffix[=CADEIA]  usa CADEIA ou \"\" como sufixo para "
+"valores\n"
+"                                msgstr\n"
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Um argumento --flag não tem a sintaxe <palavra-chave>:<argnum>:"
+"[pass-]<bandeira>: %s"
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "entrada padrão"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"A opção --msgid-bugs-address não foi especificada.\n"
+"Se está a usar um ficheiro \"Makevars\", por favor\n"
+"especifique aí a variável MSGID_BUGS_ADDRESS; senão,\n"
+"especifique uma opção de comando --msgid-bugs-address.\n"
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "linguagem \"%s\" desconhecida"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Por favor, especifique a codificação da fonte com --from-code\n"
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d: sequência multi-byte longa incompleta.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: src/x-javascript.c:303
+#, 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:%d: sequência multi-byte incompleta no fim do ficheiro.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: src/x-javascript.c:312
+#, 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:%d: sequência multi-byte incompleta no fim da linha.\n"
+"Por favor, especifique a codificação correcta da fonte com --from-code.\n"
+
+#: src/x-javascript.c:344
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação da fonte com --from-code.\n"
+
+#: src/x-javascript.c:919
+#, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: aviso: literal de RegExp terminado muito cedo"
+
+#: src/x-javascript.c:1027
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: aviso: %s não é permitido"
+
+#: src/x-javascript.c:1041
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: aviso: marcação XML não terminada"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr "%s:%d: impossível encontrar terminador da cadeia \"%s\" antes de EOF"
+
+#: src/x-perl.c:1074
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: chaveta direita em falta em \\x{HEXNUMBER}"
+
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolação inválida (\"\\l\") de carácter de 8bit \"%c\""
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolação inválida (\"\\u\") de carácter de 8bit \"%c\""
+
+#: src/x-perl.c:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: interpolação de variável inválida em \"%c\""
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolação inválida (\"\\L\") de carácter de 8bit \"%c\""
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolação inválida (\"\\U\") de carácter de 8bit \"%c\""
+
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
+"Por favor, especifique a codificação da fonte com --from-code ou com um "
+"comentário,\n"
+"como especificado em http://www.python.org/peps/pep-0263.html.\n"
 
-#~ msgid "this is the location of the first definition"
-#~ msgstr "este � o local da primeira defini��o"
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação da fonte com --from-code ou com um\n"
+"comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
+
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: sequência multi-byte longa incompleta.\n"
+"Por favor, especifique a codificação da fonte com --from-code ou com um\n"
+"comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
+
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: sequência multi-byte incompleta no fim do ficheiro.\n"
+"Por favor, especifique a codificação da fonte com --from-code ou com um\n"
+"comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
+
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: sequência multi-byte incompleta no fim da linha.\n"
+"Por favor, especifique a codificação da fonte com --from-code ou com um\n"
+"comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: sequência multi-byte inválida.\n"
+"Por favor, especifique a codificação da fonte com --from-code ou com um\n"
+"comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "Codificação \"%s\" desconhecida. A continuar com ASCII."
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: definição de cadeia inválida"
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: número em falta após #"
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: expressão de cadeia inválida"
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: definição de cadeia inválida"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: definição de cadeia inválida"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: aviso: a sintaxe $\"...\" está obsoleta por razões de segurança; use "
+"antes eval_gettext"
+
+#: src/x-vala.c:616
+#, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: aviso: literal de expressão regular terminou muito cedo"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<sem nome>"
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "sequência UTF-8 inválida"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr "\"%s\" não é um nome válido: %c"
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr "\"%s\" não é um nome válido: %c"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, c-format
+msgid "invalid character reference: %s"
+msgstr "referência de carácter inválida: %s"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr "especificação de número inválida"
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr "sem \";\" final"
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr "carácter não permitido"
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr "vazio"
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr "desconhecido"
+
+#: libgettextpo/markup.c:608
+#, c-format
+msgid "invalid entity reference: %s"
+msgstr "referência de entidade inválida: %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr "o documento tem de começar por um elemento"
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr "carácter inválido após \"%s\""
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr "\"%c\" em falta"
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr "\"%c\" ou \"%c\" em falta"
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr "um nome de fecho de elemento"
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr "o elemento está fechado"
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr "documento vazio"
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr "após \"<\""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr "elementos ainda abertos"
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr "\">\" em falta"
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr "dentro do nome de um elemento"
+
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "dentro de um nome de atributo"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr "dentro de uma etiqueta aberta"
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr "após \"=\""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr "dentro de um valor de atributo"
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr "dentro da etiqueta de fecho"
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr "dentro de um comentário ou instrução de processamento"
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr "o documento terminou inesperadamente: %s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opção \"--%s\" não permite argumentos\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opção não reconhecida \"--%s\"\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: a opção \"-W %s\" é ambígua\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" não permite argumentos\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" requer um argumento\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "aviso: cabeçalho do ficheiro PO confuso\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "aviso: versões antigas de msgfmt vão dar um erro assim\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Carácter não-ASCII em %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Comentário não-ASCII em ou antes de %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Cadeia não-ASCII em %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: aviso: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Apesar de ser usada numa posição de cadeia de formato, %s não é uma "
+#~ "cadeia de formato %s válida. Motivo: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Apesar de declarada como tal, %s não é uma cadeia de formato %s válida. "
+#~ "Motivo: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "uma cadeia de formato %s com argumentos sem nome não pode ser "
+#~ "propriamente\n"
+#~ "localizada: o tradutor não ode reordenar os argumentos.\n"
+#~ "Por favor, considere usar uma cadeia de formato com argumentos com nome,\n"
+#~ "e um mapa, em vez de tuple para os argumentos.\n"
+
+#~ 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 ""
+#~ "msgid vazia. É reservada pelo GNU gettext:\n"
+#~ "gettext(\"\") devolve a entrada de cabeçalho com\n"
+#~ "meta-informação, não a cadeia vazia.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "especificação de argumento ambígua para palavra-chave \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "aviso: contexto em falta para palavra-chave \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "aviso: contexto em falta para argumento plural da palavra-chave \"%.*s\""
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "troca de contexto entre forma plural e singular"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: op��o ilegal -- %c\n"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] [[[DIALECTO] MSGID] | [-s [MSGID]...]]\n"
+#~ " -d, --domain=DIALECTO     obt�m as mensagems traduzidas do DIALECTO\n"
+#~ " -e                        permite a expans�o de algumas sequ�ncias de "
+#~ "escape\n"
+#~ " -E                        (ignorado para compatibilidade)\n"
+#~ " -h, --help                mostra esta ajuda e sai\n"
+#~ " -n                        suprime o newline final\n"
+#~ " -V, --version             mostra a informa��o de vers�o e sai\n"
+#~ " [DIALECTO] MSGID          obt�m a mensagem traduzida correspondente a\n"
+#~ "                           MSGID do DIALECTO\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Se o par�metro DIALECTO n�o for fornecido, o dom�nio � determinado a\n"
+#~ "partir da vari�vel TEXTDOMAIN do ambiente. Se o cat�logo de mensagens\n"
+#~ "n�o for encontrado no direct�rio regular, pode ser especificada outra\n"
+#~ "localiza��o atrav�s da vari�vel TEXTDOMAINDIR do ambiente.\n"
+#~ "Quando usado com a op��o -s, o programa comporta-se como o comando\n"
+#~ "`echo'. Contudo ele n�o copia simplesmente os seus argumentos para o\n"
+#~ "stdout. Em vez disso as mensagens encontradas no cat�logo seleccionado\n"
+#~ "s�o traduzidas.\n"
+#~ "Direct�rio standard de pesquisa: %s\n"
+
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...este � o local da primeira defini��o"
+
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
+
+#~ msgid "while preparing output"
+#~ msgstr "durante a prepara��o da sa�da"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] FICHEIRODEENTRADA...\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -a, --extract-all              extrai todas as cadeias\n"
+#~ "  -c, --add-comments[=TAG]       coloca o bloco comentado com TAG (ou as\n"
+#~ "                                 linhas de cabe�alho precedentes) no "
+#~ "ficheiro\n"
+#~ "                                 de sa�da.\n"
+#~ "  -C, --c++                      reconhece coment�rios do tipo C++\n"
+#~ "      --debug                    produz resultados mais detalhados do\n"
+#~ "                                 reconhecimento das cadeias de "
+#~ "formata��o\n"
+#~ "  -d, --default-domain=NOME      usa NOME.po para a sa�da (em vez de\n"
+#~ "                                 messages.po)\n"
+#~ "  -D, --directory=DIRECT�RIO     adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "   \"                             os ficheiros de entrada\n"
+#~ "  -e, --no-escape                n�o usa sequ�ncias de escape do C na "
+#~ "sa�da\n"
+#~ "                                 (op��o por defeito)\n"
+#~ "  -E, --escape                   usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                                 usando caracteres especiais\n"
+#~ "  -f, --files-from=FICHEIRO      obt�m lista de ficheiros de entrada de\n"
+#~ "                                 FICHEIRO\n"
+#~ "      --force-po                 escreve o ficheiro PO mesmo se este "
+#~ "estiver\n"
+#~ "                                 vazio\n"
+#~ "  -F, --sort-by-file             ordena a sa�da pela localiza��o dos "
+#~ "ficheiros\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
+#~ "                                 that only unique messages be printed\n"
+#~ msgstr ""
+#~ " -n, --add-location             gera linhas do tipo '#: filename:line'\n"
+#~ "                                (op��o utilizada por defeito)\n"
+#~ "     --omit-header              n�o escreve cabe�alhos com campos `msgid"
+#~ "\"\"'\n"
+#~ " -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
+#~ "                                direct�rio DIR\n"
+#~ " -s, --sort-output              gera resultados ordenados, removendo os\n"
+#~ "                                duplicados\n"
+#~ "     --strict                   escreve um ficheiro .po de acordo com o\n"
+#~ "                                modo Uniforum estrito\n"
+#~ " -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
+#~ " -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"
+#~ " -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
+#~ "usado.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "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"
+#~ "  -c, --check                 perform language dependent checks on "
+#~ "strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ 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"
+#~ "  -c, --check                 executa testes dependentes da linguagem na\n"
+#~ "                              cadeia\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "      --no-hash               o ficheiro bin�rio n�o ir� incluir a "
+#~ "tabela\n"
+#~ "                              de dispers�o\n"
+#~ "  -o, --output-file=FICHEIRO  especifica o nome do ficheiro de sa�da "
+#~ "como\n"
+#~ "                              FICHEIRO\n"
+#~ "      --statistics            escreve informa��o estat�stica sobre as\n"
+#~ "                              tradu��es\n"
+#~ "      --strict                usa o modo Uniforum estrito\n"
+#~ "  -v, --verbose               lista as anormalias no ficheiro de entrada\n"
+#~ "  -V, --version               mostra a informa��o de vers�o e sai\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada � -, � usado o canal de entrada stdin. Se o\n"
+#~ "ficheiro de sa�da � -, a sa�da � escrita no canal de sa�da stdout.\n"
+
+#~ msgid "while creating hash table"
+#~ msgstr "durante a cria��o da tabela de dispers�o"
+
+#~ msgid "header field `%s' should start at beginning of line"
+#~ msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
+
+#~ msgid "field `%s' still has initial default value"
+#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] def.po ref.po\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "  -o, --output-file=FILE      result will be written to FILE\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] def.po ref.po\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -D, --directory=DIRECT�RIO  adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "                              os ficheiros de entrada\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "      --strict                modo de sa�da Uniforum estrito\n"
+#~ "  -v, --verbose               aumenta o n�vel de verbosidade da sa�da\n"
+#~ "  -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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] [FILE]...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
+#~ "  -E, --escape             use C escapes in output, no extended chars\n"
+#~ "      --force-po           write PO file even if empty\n"
+#~ "  -h, --help               display this help and exit\n"
+#~ "  -i, --indent             write indented output style\n"
+#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
+#~ "output\n"
+#~ "      --strict             write strict uniforum style\n"
+#~ "  -V, --version            output version information and exit\n"
+#~ "  -w, --width=NUMBER       set output page width\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] [FICHEIRO]...\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -e, --no-escape             n�o usa sequ�ncias de escape do C na sa�da\n"
+#~ "                              (op��o por defeito)\n"
+#~ "  -E, --escape                usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                              usando caracteres especiais\n"
+#~ "  -h, --help                  mostra esta ajuda e sai\n"
+#~ "  -i, --indent                usa o modo de sa�da alinhado\n"
+#~ "  -o, --output-file=FICHEIRO  os resultados de sa�da ser�o escritos no "
+#~ "FICHEIRO\n"
+#~ "                              em vez do canal de sa�da por defeito "
+#~ "(stdout)\n"
+#~ "      --strict                usa o modo de sa�da Uniforum estrito\n"
+#~ "  -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"
+
+#~ msgid ""
+#~ "\n"
+#~ "Convert binary .mo files to Uniforum style .po files.\n"
+#~ "Both little-endian and big-endian .mo files are handled.\n"
+#~ "If no input file is given or it is -, standard input is read.\n"
+#~ "By default the output is written to standard output.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Converte ficheiros .mo bin�rios em ficheiros .po no modo Uniforum.\n"
+#~ "Ficheiros .mo \"little-endian\" e \"big-endian\" s�o simultaneamente\n"
+#~ "tratados. Se n�o for indicado ficheiro de entrada ou este for -, �\n"
+#~ "usado o canal de entrada stdin. Por defeito a sa�da � escrita no\n"
+#~ "stdout.\n"
+
+#, fuzzy
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek \"%s\" offset %ld falhou"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Utiliza��o: %s [OP��O] FICHEIRODEENTRADA...\n"
+#~ "Os argumentos obrigat�rios para as op��es longas s�o igualmente\n"
+#~ "obrigat�rios para as op��es curtas.\n"
+#~ "  -a, --extract-all              extrai todas as cadeias\n"
+#~ "  -c, --add-comments[=TAG]       coloca o bloco comentado com TAG (ou as\n"
+#~ "                                 linhas de cabe�alho precedentes) no "
+#~ "ficheiro\n"
+#~ "                                 de sa�da.\n"
+#~ "  -C, --c++                      reconhece coment�rios do tipo C++\n"
+#~ "      --debug                    produz resultados mais detalhados do\n"
+#~ "                                 reconhecimento das cadeias de "
+#~ "formata��o\n"
+#~ "  -d, --default-domain=NOME      usa NOME.po para a sa�da (em vez de\n"
+#~ "                                 messages.po)\n"
+#~ "  -D, --directory=DIRECT�RIO     adiciona DIRECT�RIO � lista de procura "
+#~ "para\n"
+#~ "   \"                             os ficheiros de entrada\n"
+#~ "  -e, --no-escape                n�o usa sequ�ncias de escape do C na "
+#~ "sa�da\n"
+#~ "                                 (op��o por defeito)\n"
+#~ "  -E, --escape                   usa sequ�ncias de escape do C na sa�da, "
+#~ "n�o\n"
+#~ "                                 usando caracteres especiais\n"
+#~ "  -f, --files-from=FICHEIRO      obt�m lista de ficheiros de entrada de\n"
+#~ "                                 FICHEIRO\n"
+#~ "      --force-po                 escreve o ficheiro PO mesmo se este "
+#~ "estiver\n"
+#~ "                                 vazio\n"
+#~ "  -F, --sort-by-file             ordena a sa�da pela localiza��o dos "
+#~ "ficheiros\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -h, --help                     display this help and exit\n"
+#~ "  -i, --indent                   write the .po file using indented style\n"
+#~ "  -j, --join-existing            join messages with existing file\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
+#~ "                                 WORD means not to use default keywords)\n"
+#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
+#~ "instead %u\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ "      --no-location              do not write '#: filename:line' lines\n"
+#~ msgstr ""
+#~ " -h, --help                     mostra esta ajuda e sai\n"
+#~ " -i, --indent                   escreve o ficheiro .po usando o modo de\n"
+#~ "                                sa�da alinhado\n"
+#~ " -j, --join-existing            combina as mensagens com o ficheiro "
+#~ "existente\n"
+#~ " -k, --keyword[=PALAVRA]        palavra chave adicional a ser procurada\n"
+#~ "                                (sem PALAVRA significa n�o usar as "
+#~ "palavras\n"
+#~ "                                chave por defeito)\n"
+#~ " -l, --string-limit=N�MERO      especifica o tamanho m�ximo das cadeias "
+#~ "como\n"
+#~ "                                N�MERO, em vez de %u\n"
+#~ " -m, --msgstr-prefix[=CADEIA]   usa CADEIA or \"\" como prefixo para os\n"
+#~ "                                campos `msgstr'\n"
+#~ " -M, --msgstr-suffix[=STRING]   usa CADEIA ou \"\" como sufixo para as "
+#~ "cadeias\n"
+#~ "                                `msgstr'\n"
+#~ "     --no-location              n�o escreve linhas do tipo '#: filename:"
+#~ "line'\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ "  -o, --output=FILE              write output to specified file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
+#~ "  -V, --version                  output version information and exit\n"
+#~ "  -w, --width=NUMBER             set output page width\n"
+#~ "  -x, --exclude-file=FILE        entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ " -n, --add-location             gera linhas do tipo '#: filename:line'\n"
+#~ "                                (op��o utilizada por defeito)\n"
+#~ "     --omit-header              n�o escreve cabe�alhos com campos `msgid"
+#~ "\"\"'\n"
+#~ " -p, --output-dir=DIR           os ficheiros de sa�da ser�o colocados no\n"
+#~ "                                direct�rio DIR\n"
+#~ " -s, --sort-output              gera resultados ordenados, removendo os\n"
+#~ "                                duplicados\n"
+#~ "     --strict                   escreve um ficheiro .po de acordo com o\n"
+#~ "                                modo Uniforum estrito\n"
+#~ " -T, --trigraphs                entende trigrafos ANSI C na entrada\n"
+#~ " -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"
+#~ " -x, --exclude-file=FICHEIRO    os campos do FICHEIRO n�o s�o extra�dos\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) �\n"
+#~ "usado.\n"
 
 #~ msgid "duplicate message ID"
 #~ msgstr "ID de mensagem duplicada"
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 6df1a4c6f..409052e2c 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -1,44 +1,47 @@
-# Brazilian Portuguese translation of the gettext messages
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Brazilian Portuguese translations for gettext-tools
+# Traduções em português brasileiro para gettext-tools
+# Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Sandro Nunes Henrique <sandro@conectiva.com.br>, 1998
 # Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
 # Flávio Bruno Leitner <flavio@conectiva.com.br>, 2001.
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2013, 2014, 2015.
-#
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-22 17:59+0900\n"
-"PO-Revision-Date: 2015-12-23 10:08-0200\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2017-01-19 10:31-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+"net>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "argumento inválido %s para %s"
+msgstr "argumento inválido %s para %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argumento ambíguo %s para %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Argumentos válidos são:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "não foi possível localizar um diretório temporário, tente definir $TMPDIR"
+msgstr ""
+"não foi possível localizar um diretório temporário, tente definir $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:339
 #, c-format
@@ -48,215 +51,199 @@ msgstr "não foi possível criar um diretório temporário usando o modelo \"%s\
 #: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "não foi possível remover arquivo temporário %s"
+msgstr "não foi possível remover o arquivo temporário %s"
 
 #: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "não foi possível remover diretório temporário %s"
+msgstr "não foi possível remover o diretório temporário %s"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
-msgstr "preservando permissões para %s"
+msgstr "preservando permissões de %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "erro ao abrir %s para leitura"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
-msgstr "não foi possível abrir arquivo backup %s para gravação"
+msgstr "não foi possível abrir arquivo backup %s para escrita"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "erro ao ler %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "erro ao escrever %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "erro após leitura de %s"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() falhou"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr "Compilador C# não encontrado, tente instalar pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
+msgstr "O compilador C# não foi localizado, tente instalar pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr "Máquina virtual C# não encontrada, tente instalar pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
+msgstr "A máquina virtual C# não foi localizada, tente instalar pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
-msgstr "Erro de sistema desconhecido"
+msgstr "Erro desconhecido de sistema"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
-msgstr "subprocesso de %s falhou"
-
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opção \"%s\" é ambígua; possibilidades:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: opção \"%s\" é ambígua\n"
-
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opção \"--%s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opção \"%c%s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opção \"%s\" requer um argumento\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opção não reconhecida \"--%s\"\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opção não reconhecida \"%c%s\"\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+msgstr "subprocesso %s falhou"
+
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a opção \"%s\" é ambígua\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
+
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: opção desconhecida \"%c%s\"\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: a opção \"%c%s\" não permite um argumento\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: a opção \"%s\" exige um argumento\n"
+
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opção requer um argumento -- \"%c\"\n"
+msgstr "%s: opção exige um argumento -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opção \"-W %s\" é ambígua\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opção \"-W %s\" não aceita um argumento\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opção \"-W %s\" requer um argumento\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "argumento source_version inválido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumento target_version inválido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "falha ao criar \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "erro ao gravar o arquivo \"%s\""
+msgstr "erro ao escrever o arquivo \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "compilador de Java não encontrado, tente instalar gcj ou definir $JAVAC"
+msgstr ""
+"O compilador de Java não foi localizado, tente instalar gcj ou definir $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "máquina virtual Java não encontrada, tente instalar gij ou definir $JAVA"
+msgstr ""
+"A máquina virtual Java não foi localizada, tente instalar gij ou definir "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "erro de E/S no subprocesso de %s"
+msgstr "erro de E/S no subprocesso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
-msgstr "memória insuficiente"
+msgstr "memória esgotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
-msgstr "criação de fluxos falhou"
+msgstr "a criação de threads falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
-msgstr "escrita para subprocesso %s falhou"
+msgstr "escrita no subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "leitura do subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "não foi possível configurar E/S sem bloqueio para subprocesso %s"
+msgstr "não foi possível configurar E/S sem bloqueio para o subprocesso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
-msgstr "comunicação com subprocesso %s falhou"
+msgstr "a comunicação com o subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
-msgstr "subprocesso de %s terminado com código de saída %d"
+msgstr "subprocesso %s terminado com código de saída %d"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
@@ -277,79 +264,84 @@ msgstr "subprocesso de %s terminado com código de saída %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
-msgstr "\""
+msgstr "“"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
-msgstr "\""
+msgstr "”"
 
 #: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
-msgstr "definindo permissões para %s"
+msgstr "definindo permissões de %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
-msgstr "não foi possível criar redirecionamento (pipe)"
+msgstr "não foi possível criar redirecionamento"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle falhou"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "não foi possível restaurar fd %d dup2 falhou"
+msgstr "não foi possível restaurar descritor de arquivo %d: dup2 falhou"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
-msgstr "subprocesso de %s"
+msgstr "subprocesso %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "subprocesso de %s recebeu o sinal fatal %d"
+msgstr "subprocesso %s recebeu o sinal fatal %d"
+
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
 
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "O elemento raiz deve ser <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "O elemento raiz <%s> não contém um elemento <%s> válido"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "O elemento raiz <%s> não possui o atributo <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente \"%s --help\" para mais informações.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Uso: %s [OPÇÃO] [ARQUIVO...] [REGRAS DE LOCALE]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -365,7 +357,7 @@ msgstr ""
 "Se nenhum argumento for fornecido, ele lê as regras de plural CLDR da\n"
 "entrada padrão.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,27 +366,28 @@ msgstr ""
 "Argumentos obrigatórios para opções longas também são para as curtas.\n"
 "Da mesma forma para argumentos opcionais.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  mostra regras de plural no formato CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+msgstr ""
+"  -c, --cldr                  mostra regras de plural no formato CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  exibe essa ajuda e sai\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               exibe a informação da versão e sai\n"
@@ -403,104 +396,116 @@ msgstr "  -V, --version               exibe a informação da versão e sai\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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
-
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
-#, c-format, no-wrap
+msgstr ""
+"Relate erros para <bug-gnu-gettext@gnu.org>.\n"
+"Relate erros de tradução para <ldpbr-translation@lists.sourceforge.net>\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
-"Este é um software livre: você é livre para alterar e redistribui-lo.\n"
-"NÃO HÁ GARANTIA, à extensão permitida pela lei.\n"
+"Este é um software livre: você é livre para alterá-lo e redistribuí-lo.\n"
+"NÃO HÁ QUALQUER GARANTIA, na máxima extensão permitida em lei.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s não pode ser lido"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "não foi possível extrair regras para %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "não foi possível analisar regra CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "operando extra %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "uma especificação de formato para o argumento %u, como em \"%s\", não existe em \"%s\""
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"uma especificação de formato para o argumento %u, como em \"%s\", não existe "
+"em \"%s\""
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "uma especificação de formato para o argumento %u não existe em \"%s\""
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "especificações de formato em \"%s\" e \"%s\", para argumento %u, não são o mesmo"
+msgstr ""
+"especificações de formato em \"%s\" e \"%s\", para argumento %u, não são o "
+"mesmo"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "A diretiva número %u inicia com |, mas não termina com |."
@@ -508,59 +513,78 @@ msgstr "A diretiva número %u inicia com |, mas não termina com |."
 #: src/format.c:152
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "\"%s\" não é um formato de string %s válido, ao contrário de \"%s\". Motivo: %s"
+msgstr ""
+"\"%s\" não é um formato de string %s válido, ao contrário de \"%s\". Motivo: "
+"%s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Na diretiva número %u, o token após \"<\" não é o nome de uma macro especificadora de formato. Os nomes de macro válidos são listados na ISO C 99 seção 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Na diretiva número %u, o token após \"<\" não é o nome de uma macro "
+"especificadora de formato. Os nomes de macro válidos são listados na ISO C "
+"99 seção 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Na diretiva número %u, o token após \"<\" não está seguido por \">\"."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "A string refere-se ao argumento número %u, mas ignora o argumento número %u."
+msgstr ""
+"A string refere-se ao argumento número %u, mas ignora o argumento número %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "número de especificações de formato em \"%s\" e \"%s\" não conferem"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Na diretiva número %u, \"{\" não está seguido por um número de argumento."
+msgstr ""
+"Na diretiva número %u, \"{\" não está seguido por um número de argumento."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Na diretiva número %u, \",\" não está seguido por um número."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "A string termina no meio de uma diretriz: encontrado \"{\" sem a \"}\" correspondente."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"A string termina no meio de uma diretriz: encontrado \"{\" sem a \"}\" "
+"correspondente."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "A diretiva número %u termina com um caractere inválido \"%c\" ao invés de \"}\"."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"A diretiva número %u termina com um caractere inválido \"%c\" ao invés de "
+"\"}\"."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "A diretiva número %u termina com um caractere inválido ao invés de \"}\"."
+msgstr ""
+"A diretiva número %u termina com um caractere inválido ao invés de \"}\"."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "A string inicia no meio de uma diretiva: encontrado \"}\" sem \"{\" correspondente."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"A string inicia no meio de uma diretiva: encontrado \"}\" sem \"{\" "
+"correspondente."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "A string contém \"}\" sozinho após diretiva de número %u."
@@ -577,13 +601,21 @@ msgstr "Na diretiva de número %u, a precisão não é permitida antes \"%c\"."
 
 #: 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 "Na diretiva de número %u, o número do argumento da precisão deve ser igual a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Na diretiva de número %u, o número do argumento da precisão deve ser igual a "
+"%u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Na diretiva de número %u, uma especificação de precisão não é permitida antes de \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Na diretiva de número %u, uma especificação de precisão não é permitida "
+"antes de \"%c\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -620,93 +652,144 @@ msgid "The string ends in the middle of a directive."
 msgstr "A string termina no meio de uma diretiva."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "A string faz referência a argumentos por meio de números de argumento absoluto e por especificações de argumento sem número."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"A string faz referência a argumentos por meio de números de argumento "
+"absoluto e por especificações de argumento sem número."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "Na diretiva número %u, o argumento de número 0 não é um inteiro positivo."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"Na diretiva número %u, o argumento de número 0 não é um inteiro positivo."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Na diretiva de número %u, o argumento de número 0 da largura não é um inteiro positivo."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Na diretiva de número %u, o argumento de número 0 da largura não é um "
+"inteiro positivo."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Na diretiva de número %u, o argumento de número 0 da precisão é não um inteiro positivo."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Na diretiva de número %u, o argumento de número 0 da precisão é não um "
+"inteiro positivo."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "Na diretiva de número %u, o caractere \"%c\" não é uma especificação de conversão válida."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"Na diretiva de número %u, o caractere \"%c\" não é uma especificação de "
+"conversão válida."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "O caractere que termina a diretiva de número %u não é uma especificação de conversão válida."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"O caractere que termina a diretiva de número %u não é uma especificação de "
+"conversão válida."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "A string faz referência ao argumento de número %u de formas incompatíveis."
+msgstr ""
+"A string faz referência ao argumento de número %u de formas incompatíveis."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "Na diretiva de número %u, a sub-string \"%s\" não é um estilo de data/hora válido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"Na diretiva de número %u, a sub-string \"%s\" não é um estilo de data/hora "
+"válido."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Na diretiva número %u, \"%s\" não está seguido por uma vírgula."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Na diretiva de número %u, a sub-string \"%s\" não é um estilo de número válido."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"Na diretiva de número %u, a sub-string \"%s\" não é um estilo de número "
+"válido."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Na diretiva de número %u, o argumento de número não é seguido por uma vírgula e um de \"%s\", \"%s\", \"%s\" e \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Na diretiva de número %u, o argumento de número não é seguido por uma "
+"vírgula e um de \"%s\", \"%s\", \"%s\" e \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Na diretiva de número %u, uma escolha contém nenhum número."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Na diretiva de número %u, uma escolha contém um número que não é seguido por \"<\", \"#\" ou \"%s\"."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Na diretiva de número %u, uma escolha contém um número que não é seguido por "
+"\"<\", \"#\" ou \"%s\"."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "uma especificação de formato para o argumento {%u}, como em \"%s\", não existe em \"%s\""
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"uma especificação de formato para o argumento {%u}, como em \"%s\", não "
+"existe em \"%s\""
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "uma especificação de formato para o argumento {%u} não existe em \"%s\""
+msgstr ""
+"uma especificação de formato para o argumento {%u} não existe em \"%s\""
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "especificações de formato em \"%s\" e \"%s\", para argumento {%u}, não são o mesmo"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"especificações de formato em \"%s\" e \"%s\", para argumento {%u}, não são o "
+"mesmo"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "A string refere-se ao argumento número %u, mas ignora o argumentos %u e %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"A string refere-se ao argumento número %u, mas ignora o argumentos %u e %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "uma especificação de formato para argumentos %u e %u não existem em \"%s\", apenas um argumento pode ser ignorado"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"uma especificação de formato para argumentos %u e %u não existem em \"%s\", "
+"apenas um argumento pode ser ignorado"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -717,15 +800,27 @@ msgstr "erro na análise: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Na diretiva de número %u, parâmetro %u é do tipo \"%s\", mas um parâmetro do tipo \"%s\" é esperado."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Na diretiva de número %u, parâmetro %u é do tipo \"%s\", mas um parâmetro do "
+"tipo \"%s\" é esperado."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Na diretiva de número %u, parâmetros demais foram passados; esperava no máximo %u parâmetro."
-msgstr[1] "Na diretiva de número %u, parâmetros demais foram passados; esperava no máximo %u parâmetros."
+msgid ""
+"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."
+msgstr[0] ""
+"Na diretiva de número %u, parâmetros demais foram passados; esperava no "
+"máximo %u parâmetro."
+msgstr[1] ""
+"Na diretiva de número %u, parâmetros demais foram passados; esperava no "
+"máximo %u parâmetros."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -755,8 +850,12 @@ msgstr "Na diretiva de número %u, os modificadores @ e : foram passados."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Na diretiva de número %u, \"~:[\" não é seguido por duas cláusulas, separadas por \"~;\"."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Na diretiva de número %u, \"~:[\" não é seguido por duas cláusulas, "
+"separadas por \"~;\"."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -775,161 +874,206 @@ msgstr "especificações de formato em \"%s\" e \"%s\" não são equivalentes"
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "especificações de formato em \"%s\" não são um subconjunto deles em \"%s\""
+msgstr ""
+"especificações de formato em \"%s\" não são um subconjunto deles em \"%s\""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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 "uma especificação de formato para o argumento \"%s\" não existe em \"%s\""
+msgstr ""
+"uma especificação de formato para o argumento \"%s\" não existe em \"%s\""
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Na diretiva de número %u, a especificação do tamanho é incompatível com a especificação da conversão \"%c\"."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Na diretiva de número %u, a especificação do tamanho é incompatível com a "
+"especificação da conversão \"%c\"."
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um nome de campo."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "Na diretiva de número %u, não é mais permitido empilhamento em um especificador de formato."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Na diretiva de número %u, não é mais permitido empilhamento em um "
+"especificador de formato."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Na diretiva número %u, há uma diretiva de formato não terminado."
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "A string faz referência a argumentos de tanto nomes de argumentos quanto especificações de argumentos sem nome."
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"A string faz referência a argumentos de tanto nomes de argumentos quanto "
+"especificações de argumentos sem nome."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "A string faz referência ao argumento chamado \"%s\" em formas incompatíveis."
+msgstr ""
+"A string faz referência ao argumento chamado \"%s\" em formas incompatíveis."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "especificações de formatos em \"%s\" esperam um mapeamento, enquanto aqueles em \"%s\" esperam uma tupla"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"especificações de formatos em \"%s\" esperam um mapeamento, enquanto aqueles "
+"em \"%s\" esperam uma tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "especificações de formatos em \"%s\" esperam um tupla, enquanto aqueles em \"%s\" esperam um mapeamento"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"especificações de formatos em \"%s\" esperam um tupla, enquanto aqueles em "
+"\"%s\" esperam um mapeamento"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "uma especificação de formato para o argumento \"%s\", como em \"%s\", não existe em \"%s\""
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"uma especificação de formato para o argumento \"%s\", como em \"%s\", não "
+"existe em \"%s\""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "especificações de formato em \"%s\" e \"%s\" para o argumento \"%s\" não são o mesmo"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"especificações de formato em \"%s\" e \"%s\" para o argumento \"%s\" não são "
+"o mesmo"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "\"%s\" é um formato de string simples, mas \"%s\" não é: ele contém uma flag \"L\" ou um número de argumento de dois dígitos"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"\"%s\" é um formato de string simples, mas \"%s\" não é: ele contém uma flag "
+"\"L\" ou um número de argumento de dois dígitos"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "A string faz referência a uma variável shell com um nome não ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "A string faz referência a uma variável shell com sintaxe com braçadeiras de shell complexas. Não há suporte a esta sintaxe devido a motivos de segurança."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"A string faz referência a uma variável shell com sintaxe com braçadeiras de "
+"shell complexas. Não há suporte a esta sintaxe devido a motivos de segurança."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "A string faz referência a uma variável shell cujo valor pode ser diferente dentro de funções shell."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"A string faz referência a uma variável shell cujo valor pode ser diferente "
+"dentro de funções shell."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "A string faz referência a uma variável shell com um nome vazio."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "Na diretiva de número %u, o caractere \"%c\" não é um dígito entre 1 e 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr ""
+"Na diretiva de número %u, o caractere \"%c\" não é um dígito entre 1 e 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "O caractere que termina a diretiva de número %u não é um dígito entre 1 e 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"O caractere que termina a diretiva de número %u não é um dígito entre 1 e 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
-msgstr "excesso de argumentos"
+msgstr "número excessivo de argumentos"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uso: %s [OPÇÃO]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Emite o nome da máquina.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato da saída:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nome de máquina curto\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          nome de máquina longo, inclui fully qualified\n"
 "                              domain e apelidos (aliases)\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            endereços para o nome da máquina\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "não foi possível obter nome de máquina"
@@ -939,7 +1083,7 @@ msgstr "não foi possível obter nome de máquina"
 msgid "selector is not specified"
 msgstr "seletor não está especificado"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "não foi possível criar contexto XPath"
@@ -949,28 +1093,28 @@ msgstr "não foi possível criar contexto XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "não foi possível avalisar expressão XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "nó \"%s\" não contém \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "valor de atributo inválido \"%s\" para \"%s\""
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "o elemento raiz não é \"rules\" sob espaço de nome %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "não foi possível ler %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "não foi possível avalisar camiho da localização XPath: %s"
@@ -990,28 +1134,28 @@ msgstr "não foi possível ler o arquivo XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "o elemento raiz não é \"locatingRules\""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "no máximo um arquivo é permitido"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1020,340 +1164,388 @@ msgstr ""
 "Filtra as mensagens de um catálogo de tradução de acordo com seus atributos\n"
 "e manipula-os.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localização do arquivo de entrada:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ARQUIVO-ENTRADA             arquivo PO de entrada\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRETÓRIO   adiciona DIRETÓRIO à lista de arquivos de\n"
 "                              entrada para pesquisar\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Se nenhum arquivo de entrada for passado ou se for -, a entrada padrão é lida.\n"
+msgstr ""
+"Se nenhum arquivo de entrada for passado ou se for -, a entrada padrão é "
+"lida.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localização do arquivo de saída:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=ARQUIVO   escreve a saída para o arquivo especificado\n"
+msgstr ""
+"  -o, --output-file=ARQUIVO   escreve a saída para o arquivo especificado\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Os resultados são escritos para a saída padrão se nenhum arquivo de saída for\n"
+"Os resultados são escritos para a saída padrão se nenhum arquivo de saída "
+"for\n"
 "especificado ou se ele for -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Seleção de mensagem:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            mantém as traduzidas, remove as mensagens não\n"
 "                              traduzidas\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          mantém as não traduzidas, remove as mensagens\n"
 "                              traduzidas\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              remove as mensagens marcadas com \"fuzzy\"\n"
+msgstr ""
+"      --no-fuzzy              remove as mensagens marcadas com \"fuzzy\"\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            mantém as mensagens marcadas com \"fuzzy\"\n"
+msgstr ""
+"      --only-fuzzy            mantém as mensagens marcadas com \"fuzzy\"\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove mensagens obsoletas (#~)\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantém mensagens obsoletas (#~)\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulação de atributo:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             define \"fuzzy\" em todas as mensagens\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           apaga \"fuzzy\" de todas as mensagens\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          define como obsoletas todas as mensagens\n"
+msgstr ""
+"      --set-obsolete          define como obsoletas todas as mensagens\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        define como não obsoletas todas as mensagens\n"
+msgstr ""
+"      --clear-obsolete        define como não obsoletas todas as mensagens\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              ao definir \"fuzzy\", mantém msgids anteriores\n"
+"      --previous              ao definir \"fuzzy\", mantém msgids "
+"anteriores\n"
 "                              de mensagens traduzidas.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr ""
 "      --clear-previous        remove a \"previous msgid\" de todas as\n"
 "                              mensagens\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 ao remover os \"fuzzy\", também esvazia a msgstr\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 ao remover os \"fuzzy\", também esvazia a "
+"msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=ARQUIVO.po  manipula apenas entradas listadas no ARQUIVO.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=ARQUIVO.po  manipula apenas entradas listadas no ARQUIVO."
+"po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=ARQUIVO.po\n"
 "                              manipula apenas entradas não listadas no\n"
 "                              ARQUIVO.po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinônimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              sinônimo de --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              sinônimo de --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxe do arquivo de entrada:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      arquivo de entrada está em sintaxe de\n"
 "                              .properties Java\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     arquivo de entrada está em sintaxe de\n"
 "                              .strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalhes de entrada:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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 cores e outros atributos de atributos\n"
-"      --color=QUANDO          usa cores e outros atributos de texto se QUANDO.\n"
-"                              QUANDO pode ser \"always\", \"never\", \"auto\" ou\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 usa sempre cores e outros atributos de "
+"atributos\n"
+"      --color=QUANDO          usa cores e outros atributos de texto se "
+"QUANDO.\n"
+"                              QUANDO pode ser \"always\", \"never\", \"auto"
+"\" ou\n"
 "                              \"html\".\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
-"      --style=ARQUIVO-ESTILO  especifica arquivo de regras de estilo CSS para\n"
+"      --style=ARQUIVO-ESTILO  especifica arquivo de regras de estilo CSS "
+"para\n"
 "                              --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             não usa escapes de C na saída (padrão)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                usa escapes de C na saída, nenhum caractere\n"
 "                              estendido\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              escreve um arquivo PO mesmo se vazio\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                escreve o arquivo .po usando estilo com recuo\n"
+msgstr ""
+"  -i, --indent                escreve o arquivo .po usando estilo com recuo\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           não escreve linhas \"#: nome-de-arquivo:linha\"\n"
+msgstr ""
+"      --no-location           não escreve linhas \"#: nome-de-arquivo:linha"
+"\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          gera linhas \"#: nome-de-arquivo:linha' (padrão)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          gera linhas \"#: nome-de-arquivo:"
+"linha' (padrão)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escreve um arquivo .po em conformidade com\n"
 "                              com Uniforum estrito\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escreve em arquivo .properties de Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    escreve um arquivo .strings de NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    escreve um arquivo .strings de NeXTstep/"
+"GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          define a largura da página de saída\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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ão quebra linhas de mensagens longas, maiores\n"
-"                              do que a largura da página de saída, em várias\n"
+"      --no-wrap               não quebra linhas de mensagens longas, "
+"maiores\n"
+"                              do que a largura da página de saída, em "
+"várias\n"
 "                              linhas\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           gera uma saída ordenada\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          ordena a saída por localização de arquivos\n"
+msgstr ""
+"  -F, --sort-by-file          ordena a saída por localização de arquivos\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1376,23 +1568,24 @@ msgstr ""
 "--use-first for especificado, eles vão ser obtidos do primeiro arquivo PO para\n"
 "defini-los.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ARQUIVO-ENTRADA ...         arquivos de entrada\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=ARQUIVO    obtém lista de arquivos de entrada de ARQUIVO\n"
+msgstr ""
+"  -f, --files-from=ARQUIVO    obtém lista de arquivos de entrada de ARQUIVO\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Se o arquivo de entrada for -, a entrada padrão é lida.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1401,7 +1594,7 @@ msgstr ""
 "  -<, --less-than=NÚMERO      exibe mensagens com menos do que esse número\n"
 "                              de definições; padrão é infinito\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1410,7 +1603,7 @@ msgstr ""
 "  ->, --more-than=NÚMERO      exibe mensagens com mais do que estas várias\n"
 "                              definições, sendo 0 se não for definida\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1419,16 +1612,17 @@ msgstr ""
 "  -u, --unique                abreviação para --less-than=2, requer que\n"
 "                              apenas mensagens únicas sejam exibidas\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      arquivos de entrada estão em sintaxe \n"
 "                              .properties do Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1437,12 +1631,12 @@ msgstr ""
 "      --stringtable-input     arquivos de entrada estão em sintaxe .strings\n"
 "                              do NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codificação da saída\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1451,34 +1645,35 @@ msgstr ""
 "      --use-first             usa a primeira tradução disponível para cada\n"
 "                              mensagem, não mescla várias traduções\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 "      --lang=NOME-CATÁLOGO    define o campo \"Language\" na mensagem de \n"
 "                              cabeçalho\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "nenhum arquivo de entrada informado"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uso: %s [OPÇÃO] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1496,84 +1691,88 @@ msgstr ""
 "coincidência exata, é marcado como aproximada (fuzzy) para se ter melhor\n"
 "diagnóstico.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduções\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referências para as fontes\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operação:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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 cada um dos domínios em def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          aplica ref.pot a cada um dos domínios em def."
+"po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     não usa marcação de aproximada\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             considera entradas aproximadas\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      considera entradas não traduzidas\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "esta mensagem está não traduzida"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "esta mensagem precisa ser revisada pelo tradutor"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem é usada, mas não foi definida..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta definição é similar"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:317
+#: 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:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1594,76 +1793,85 @@ msgstr ""
 "do primeiro arquivo PO a defini-los. Posições de arquivos de todos\n"
 "os arquivos PO serão cumulados.\n"
 
-#: src/msgcomm.c:403
+#: 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 ""
-"  ->, --more-than=NÚMERO      imprime mensagens com mais do que estas várias\n"
+"  ->, --more-than=NÚMERO      imprime mensagens com mais do que estas "
+"várias\n"
 "                              definições, sendo 1 se não for definida\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           não escreve um cabeçalho com a entrada 'msgid\"\"'\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           não escreve um cabeçalho com a entrada 'msgid"
+"\"\"'\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Converte um catálogo de tradução para uma codificação de caracteres diferente.\n"
+msgstr ""
+"Converte um catálogo de tradução para um conjunto de caracteres diferente.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Alvo de conversão:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "A codificação padrão é a codificação do local atual.\n"
+msgstr "A codificação padrão é a codificação da localização atual.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                estilo de saída com recuo\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           suprime as linhas \"#: nome-de-arquivo:linha\"\n"
+msgstr ""
+"      --no-location           suprime as linhas \"#: nome-de-arquivo:linha"
+"\"\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          preserva as linhas \"#: nome-de-arquivo:linha\"\n"
+"  -n, --add-location          preserva as linhas \"#: nome-de-arquivo:linha"
+"\"\n"
 "                              (padrão)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                estilo de saída Uniform estrito\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "nenhum arquivo de entrada fornecido"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "exatamente um arquivo de entrada é necessário"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uso: %s [OPÇÃO] ARQUIVO-ENTRADA\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1675,22 +1883,22 @@ msgstr ""
 "PO em inglês criado ou arquivo POT (geralmente criado por xgettext). Entradas\n"
 "não traduzidas estão assinadas um tradução que é idêntica no msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ARQUIVO-ENTRADA             entrada de arquivo PO ou POT\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "faltando o nome do comando"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Uso: %s [OPÇÃO] COMANDO [OPÇÃO-DO-COMANDO]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1705,56 +1913,56 @@ msgstr ""
 "saída do msgexec. O código de retorno do msgexec é o código de retorno\n"
 "máximo de todas as chamadas.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, 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 "Um comando especial embutido chamado \"0\" retorna a tradução, seguida por um byte nulo. A saída de \"msgexec 0\" serve como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Entrada de comando:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   adiciona nova linha ao fina da entrada\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=ARQUIVO-ENTRADA\n"
 "                              arquivo PO de entrada\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "Escrita para a saída padrão falhou"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "faltando o nome do filtro"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "pelo menos um script sed deve ser especificado"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uso: %s [OPÇÃO] FILTRO [OPÇÃO-DO-FILTRO]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplica um filtro em todas as traduções de um catálogo de tradução.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1763,12 +1971,12 @@ msgstr ""
 "O FILTRO pode ser qualquer programa que lê uma tradução da entrada padrão\n"
 "e escreve uma tradução modificada para a saída padrão.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Entrada e saída do filtro:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1777,49 +1985,58 @@ msgstr ""
 "  --newline                   adiciona uma nova linha ao final da entrada e\n"
 "                                remove uma nova linha do final da saída"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Lista de OPÇÃO-DE-FILTROs úteis para quando o FILTRO é \"sed\":\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SCRIPT     adiciona SCRIPT aos comandos a serem executados\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=SCRIPT     adiciona SCRIPT aos comandos a serem "
+"executados\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=ARQUIVO-SCRIPT\n"
 "                              adiciona o conteúdo do ARQUIVO-SCRIPT aos\n"
 "                              comandos a serem executados\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       suprime impressão automática do espaço de padrão\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       suprime impressão automática do espaço de "
+"padrão\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             não usa escapes de C na saída (padrão)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                estilo de saída com recuo\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           mantém mensagem de cabeçalho não modificada,\n"
 "                              não a filtra\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "saída do filtro não terminado com uma nova linha"
@@ -1835,26 +2052,27 @@ msgid "invalid endianness: %s"
 msgstr "extremidade inválida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 #: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
-msgstr "nenhum arquivo de entrada deveria ser passado se %s e %s forem especificadas."
+msgstr ""
+"nenhum arquivo de entrada deveria ser passado se %s e %s forem especificadas."
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requer especificação de um \"-d diretório\""
 
 #: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s requer especificação de um \"-l local\""
+msgstr "%s requer especificação de um \"-l localização\""
 
 #: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
@@ -1871,7 +2089,7 @@ msgstr "%s requer especificação de um \"-o arquivo\""
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s são mutuamente exclusivos em %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s é válido apenas com %s ou %s"
@@ -1881,145 +2099,170 @@ msgstr "%s é válido apenas com %s ou %s"
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s é válido apenas com %s, %s ou %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "não foi possível localizar regras ITS para %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagem traduzida"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:881
 #, 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:898
+#: src/msgfmt.c:886
 #, 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:918
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Gera um catálogo de mensagens binário a partir da descrição da tradução textual.\n"
+msgstr ""
+"Gera um catálogo de mensagens binário a partir da descrição da tradução "
+"textual.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  arquivo.po ...              arquivos de entrada\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operação:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  modo Java: gera uma classe ResourceBundle de Java\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  modo Java: gera uma classe ResourceBundle de "
+"Java\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 semelhante a --java, e supõe Java2 (JDK 1.2 +)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 semelhante a --java, e supõe Java2 (JDK 1.2 "
+"+)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                modo C#: gera um arquivo .dll de .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      modo de recursos C#: gera um arquivo .resources de .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      modo de recursos C#: gera um arquivo ."
+"resources                              de .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   modo Tcl: gera um arquivo .msg de tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   modo Tcl: gera um arquivo .msg de tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    modo Qt: gera um arquivo .qm de Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               modo Desktop Entry: gera um arquivo .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               modo Desktop Entry: gera um arquivo .desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
-msgstr "--xml                   modo XML: gera um arquivo XML\n"
+msgstr "      --xml                   modo XML: gera um arquivo XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                habilita modo Uniforum estrito\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Se o arquivo de saída for -, a saída é escrita na saída padrão.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localização do arquivo de saída em modo Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nome do recurso\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
 "  -l, --locale=LOCALIZAÇÃO    nome da localização, podendo ser o idioma ou\n"
 "                              também idioma_PAÍS\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr ""
-"      --source                produz um arquivo .java, ao invés de um arquivo\n"
+"      --source                produz um arquivo .java, ao invés de um "
+"arquivo\n"
 "                              .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRETÓRIO                diretório base de hierarquia de diretório de\n"
 "                              classes\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -2027,19 +2270,21 @@ msgstr ""
 "nome do recurso, separados por um sublinhado. A opção -d é obrigatória.\n"
 "A classe é escrita sob o diretório especificado.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localização do arquivo de saída em modo C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 "  -d DIRETÓRIO                diretório base para arquivos .dll dependentes\n"
 "                              da localização\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2048,17 +2293,18 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .dll é escrito em um\n"
 "subdiretório do diretório especificado, cujo nome depende da localização.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localização do arquivo de saída em modo Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d DIRETÓRIO                diretório base de catálogos de mensagens .msg\n"
+msgstr ""
+"  -d DIRETÓRIO                diretório base de catálogos de mensagens .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2067,22 +2313,23 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .msg é escrito no\n"
 "diretório especificado.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opções de modo Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=MODELO           um arquivo .desktop usado como um modelo\n"
+msgstr ""
+"  --template=MODELO           um arquivo .desktop usado como um modelo\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRETÓRIO                diretório base de arquivos .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2093,199 +2340,212 @@ msgstr ""
 "                              adicional\n"
 "  -k, --keyword               não usa palavras-chaves padrões\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "As opções -l, -o e --template são obrigatórias. Se -D for especificada, os\n"
 "arquivos de entrada são lidos do diretório ao invés dos argumentos da linha\n"
 "de comando.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Opções de modo XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NOME         reconhece a linguagem XML especificada\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=MODELO           um arquivo XML usado como um modelo\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretação do arquivo de entrada:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 realiza todas as verificações implicadas por\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verifica strings de formato dependente da\n"
 "                              localização\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 "      --check-header          verifica presença e conteúdo da mensagem\n"
 "                              de cabeçalho\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          verifica conflitos entre diretivas de domínios\n"
+"      --check-domain          verifica conflitos entre diretivas de "
+"domínios\n"
 "                              e a opção --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   verifica se o GNU msgfmt se comporta como\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=CHAR]\n"
 "                              verifica a presença de aceleradores de\n"
 "                              teclado para itens de menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             usa entradas aproximadas na saída\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=NÚMERO      alinha strings em NÚMERO bytes (padrão: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=NÚMERO      alinha strings em NÚMERO bytes (padrão: %d)\n"
 
 # big e little são as opções de ORDEM-DE-BYTES, portanto não traduza.
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=ORDEM-DE-BYTES\n"
 "                              escreve números 32-bit na ordem de bytes dada\n"
-"                              (\"big\" ou \"little\", dependendo da plataforma)\n"
+"                              (\"big\" ou \"little\", dependendo da "
+"plataforma)\n"
 
 # "binary" de binário (compilado, .mo), e não de executável
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               arquivo binário não vai incluir a tabela hash\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               arquivo binário não vai incluir a tabela hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            imprime estatísticas sobre traduções\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta o nível de detalhamento\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "aviso: cabeçalho do arquivo PO faltando ou inválido\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "aviso: conversão de codificação de caracteres não vai funcionar\n"
-
-#: src/msgfmt.c:1212
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "aviso: cabeçalho de arquivo PO como tradução aproximada (fuzzy)\n"
-
-#: src/msgfmt.c:1214
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "aviso: versões mais antigas do msgfmt vão dar um erro nisso\n"
+msgstr "aviso: conversão de conjunto de caracteres não vai funcionar\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1211
 #, 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:1243
+#: src/msgfmt.c:1216
 #, 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"
+msgstr ""
+"nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
+"prefixo"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "diretiva \"domain %s\" ignorada"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "mensagem \"msgstr\" vazia ignorada"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s não existe"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe, mas não pode ler"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" ou \"X\"  ser especificada"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" ou \"X"
+"\"  ser especificada"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2295,7 +2555,7 @@ msgstr ""
 "padrão fornecido ou pertence a alguns dos arquivos fontes fornecidos.\n"
 
 # Separei as frases (ou..ou...ou..) por ponto-e-vírgula denotando enumeração. Dadas as condições dessa string, penso ficar mais organizado assim - Rafael
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2350,17 +2610,19 @@ msgstr ""
 "   a PADRÃO-COMENTÁRIO-EXTRAÍDO.\n"
 "\n"
 "Quando mais de um critério de seleção é especificado, o conjunto de mensagens\n"
-"selecionadas é a união das mensagens selecionadas de cada critério.\n"
+"selecionado é a união das mensagens selecionadas de cada critério.\n"
 "\n"
-"Sintaxe de PADRÃO-MSGCTXT, PADRÃO-MSGID, PADRÃO-MSGSTR, PADRÃO-COMENTÁRIO,\n"
-"PADRÃO-COMENTÁRIO-EXTRAÍDO:\n"
+"PADRÃO-MSGCTXT, PADRÃO-MSGID, PADRÃO-MSGSTR, PADRÃO-COMENTÁRIO,\n"
+"PADRÃO-COMENTÁRIO-EXTRAÍDO possuem a seguinte sintaxe:\n"
 "  [-E | -F] [-e PADRÃO | -f ARQUIVO]...\n"
 "Os valores PADRÃO pode ser: expressões regulares básicas por padrão; \n"
 "ou expressões regulares estendidas, se -E for fornecido; ou strings fixas,\n"
 "se -F for fornecido.\n"
 "\n"
-"  -N, --location=ARQUIVO-DE-FONTE                              seleciona mensagens extraídas do ARQUIVO-FONTE\n"
-"  -M, --domain=NOME-DE-DOMÍNIO                              seleciona mensagens pertencentes ao\n"
+"  -N, --location=ARQUIVO-FONTE\n"
+"                              seleciona mensagens extraídas do ARQUIVO-FONTE\n"
+"  -M, --domain=NOME-DE-DOMÍNIO\n"
+"                              seleciona mensagens pertencentes ao\n"
 "                              domínio NOME-DE-DOMÍNIO\n"
 "  -J, --msgctxt               começo de padrões para o msgctxt\n"
 "  -K, --msgid                 começo de padrões para o msgid\n"
@@ -2372,38 +2634,46 @@ msgstr ""
 "                              novas linhas\n"
 "  -e, --regexp=PADRÃO         usa PADRÃO como uma expressão regular\n"
 "  -f, --file=ARQUIVO          obtém PADRÃO de ARQUIVO\n"
-"  -i, --ignore-case           ignora diferenciação de maiúsculas e minúsculas\n"
+"  -i, --ignore-case           ignora distinção entre maiúsculas e minúsculas\n"
 "  -v, --invert-match          exibe apenas mensagens que não corresponderem\n"
 "                              a qualquer critério de seleção\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                usa escapes de C na saída, nenhum caractere\n"
 "                              estendido\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           gera uma saída ordenada\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          ordena a saída por localização de arquivo\n"
+msgstr ""
+"      --sort-by-file          ordena a saída por localização de arquivo\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Você está em um ambiente indiferente quanto a idioma. Por favor, defina a\n"
 "sua variável de ambiente LANG, como descrita no arquivo ABOUT-NLS. Isso é\n"
 "necessário para que você possa testar suas traduções.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2414,12 +2684,12 @@ msgstr ""
 "Por favor, especifique a localização por meio da opção --locale\n"
 "ou do arquivo de saída .po através da opção --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Criado %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2428,49 +2698,58 @@ msgstr ""
 "Cria um novo arquivo PO, inicializando as informações meta com valores do\n"
 "ambiente do usuário.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 "  -i, --input=ARQUIVO-ENTRADA\n"
 "                              arquivo POT de entrada\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Se nenhum arquivo de entrada for fornecido, o diretório atual é pesquisado\n"
 "pelo arquivo POT.\n"
 "Se ele for -, a entrada padrão é lida.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=ARQUIVO   escreve a saída para o arquivo PO especificado\n"
+msgstr ""
+"  -o, --output-file=ARQUIVO   escreve a saída para o arquivo PO "
+"especificado\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"Se nenhum arquivo de entrada for fornecido, ele vai depender da opção --locale\n"
-"ou da configuração de localização do usuário. Se ele for -, os resultados são\n"
+"Se nenhum arquivo de entrada for fornecido, ele vai depender da opção --"
+"locale\n"
+"ou da configuração de localização do usuário. Se ele for -, os resultados "
+"são\n"
 "escritos para a saída padrão.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          define a localização alvo\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         pressupõe que o arquivo PO é gerado automaticamente\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         pressupõe que o arquivo PO é gerado "
+"automaticamente\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2478,12 +2757,12 @@ msgstr ""
 "Encontrado mais de um arquivo .pot.\n"
 "Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "erro ao ler o diretório atual"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2491,17 +2770,19 @@ msgstr ""
 "Encontrado nenhum arquivo .pot no diretório atual.\n"
 "Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "subprocesso de %s falhou com código de saída %d"
+msgstr "o subprocesso %s falhou com código de saída %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "O novo catálogo de mensagens deveria conter seu endereço de e-mail para que\n"
@@ -2511,64 +2792,79 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduções em português brasileiro para o pacote %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "o conjunto de caracteres presente \"%s\" não é um nome de codificação portável"
+msgstr ""
+"o conjunto de caracteres presente \"%s\" não é um nome de codificação "
+"portável"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "duas codificações de caracteres diferentes \"%s\" e \"%s\" no arquivo de entrada"
+msgstr ""
+"duas codificações de caracteres diferentes \"%s\" e \"%s\" no arquivo de "
+"entrada"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "arquivo de entrada \"%s\" não contém uma entrada de cabeçalho com uma especificação de codificação de caracteres"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"o arquivo de entrada \"%s\" não contém uma entrada de cabeçalho com uma "
+"especificação de conjunto de caracteres"
 
-#: src/msgl-cat.c:208
+#: 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 "domínio \"%s\" no arquivo de entrada \"%s\" não contém uma entrada de cabeçalho com uma especificação de conjunto de caracteres"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domínio \"%s\" no arquivo de entrada \"%s\" não contém uma entrada de "
+"cabeçalho com uma especificação de conjunto de caracteres"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "o conjunto de caracteres alvo \"%s\" não é um nome de codificação portável."
+msgstr ""
+"o conjunto de caracteres alvo \"%s\" não é um nome de codificação portável."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "aviso: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Arquivos de entrada contêm mensagens em codificações distintas, UTF-8 junto.\n"
+"Arquivos de entrada contêm mensagens em codificações distintas, UTF-8 "
+"junto.\n"
 "Convertendo a saída para UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Arquivos de entrada contêm mensagens em codificações distintas, %s e %s junto.\n"
+"Arquivos de entrada contêm mensagens em codificações distintas, %s e %s "
+"junto.\n"
 "Convertendo a saída para UTF-8.\n"
 "Para selecionar uma codificação diferente, use a opção --to-code.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2578,11 +2874,12 @@ msgid ""
 msgstr ""
 "Conversão de arquivo %s da codificação %s para %s\n"
 "altera alguns msgids ou msgctxts.\n"
-"Altere todas as msgids e msgctxts para ASCII puro ou certifique-se de que elas\n"
+"Altere todas as msgids e msgctxts para ASCII puro ou certifique-se de que "
+"elas\n"
 "estão codificadas em UTF-8 desde o começo, isto é, já em seus arquivos do\n"
 "código fonte.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2590,17 +2887,17 @@ msgid ""
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"Codificação de caracteres \"%s\" é diferente da codificação\n"
+"Conjunto de caracteres \"%s\" é diferente do conjunto\n"
 "de caracteres do arquivo de entrada \"%s\".\n"
 "Saída de \"%s\" pode estar incorreta.\n"
 "Soluções possíveis são:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Definir LC_ALL com uma localização com codificação %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2611,7 +2908,7 @@ msgstr ""
 "  aplicar \"%s\" e,\n"
 "  então, converter de volta para %s usando \"msgconv\".\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2624,92 +2921,102 @@ msgstr ""
 "  aplicar \"%s\" e,\n"
 "  então, converter de volta para %s usando \"msgconv\".\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Codificação de caractere de localização \"%s\" não é um\n"
+"O conjunto de caracteres da localização \"%s\" não é um\n"
 "nome de codificação portável.\n"
 "Saída de \"%s\" pode estar incorreta.\n"
 "Uma solução possível é definir LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "expressões de plural podem produzir valores negativos"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu, mas uma expressão plural pode produzir valores tão grandes quanto %lu"
+msgstr ""
+"nplurals = %lu, mas uma expressão plural pode produzir valores tão grandes "
+"quanto %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "expressão de plural pode produzir divisão por zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "expressão de plural pode produzir sobrecarga de inteiro"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "expressão de plural pode produzir exceções aritméticas, possivelmente divisão por zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"expressão de plural pode produzir exceções aritméticas, possivelmente "
+"divisão por zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Tente usar o seguinte, válido para %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "catálogo de mensagens possui traduções em forma de plural"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mas o cabeçalho não possui um atributo \"plural=EXPRESSÃO\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mas o cabeçalho não possui um atributo \"nplurals=INTEIRO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor de nplurals inválido"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "valor de plural inválido"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mas algumas mensagens possuem apenas uma forma de plural"
 msgstr[1] "mas algumas mensagens possuem apenas %lu formas de plural"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mas algumas mensagens possuem uma forma de plural"
 msgstr[1] "mas algumas mensagens possuem %lu formas de plural"
 
-#: src/msgl-check.c:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "catálogo de mensagens possui traduções em forma de plural, mas o cabeçalho não possui \"Plural-Forms: nplurals=INTEIRO; plural=EXPRESSÃO;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"catálogo de mensagens possui traduções em forma de plural, mas o cabeçalho "
+"não possui \"Plural-Forms: nplurals=INTEIRO; plural=EXPRESSÃO;\""
 
 #: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\" e \"msgid_plural\" não começam com \"\\n\"'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, 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\"'"
@@ -2722,7 +3029,7 @@ msgstr "\"msgid\" e \"msgstr\" não começa com \"\\n\"'"
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\" e \"msgid_plural\" não terminam com \"\\n\"'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\" e \"msgstr[%u]\" não terminam com \"\\n\"'"
@@ -2735,83 +3042,102 @@ msgstr "\"msgid\" e \"msgstr\" não terminam com \"\\n\"'"
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipulação de plural é uma extensão do GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr possui marcas de aceleradores de teclado \"%c\" demais"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "campo de cabeçalho \"%s\" ainda possui o valor inicial padrão\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo de cabeçalho \"%s\" faltando no cabeçalho\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "elipse ASCII (\"...\") ao invés de Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "espaço antes de elipse encontrado nas strings visíveis de usuário"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Aspas duplas ASCII usadas ao invés de Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Aspa simples ASCII usada ao invés de Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Marcador ASCII (\"%c\") ao invés de Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: entrada não é válida na codificação \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: erro ao converter da codificação \"%s\" para \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "arquivo de entrada não contém uma entrada cabeçalho com uma especificação de codificação de caracteres"
+msgstr ""
+"arquivo de entrada não contém uma entrada cabeçalho com uma especificação de "
+"conjunto de caracteres"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(),mas iconv() não tem suporte a esta conversão."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(),mas "
+"iconv() não tem suporte a esta conversão."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Conversão de \"%s\" para \"%s\" introduz duplicatas: algumas msgids diferentes ficaram equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Conversão de \"%s\" para \"%s\" introduz duplicatas: algumas msgids "
+"diferentes ficaram equal."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(). Esta versão foi compilada sem iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(). "
+"Esta versão foi compilada sem iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s é válida apenas com %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tipo de cópia de segurança"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2834,26 +3160,27 @@ msgstr ""
 "de arquivos serão preservados. Onde não se encontrar uma coincidência exata, é\n"
 "marcado como aproximada (fuzzy) para se ter melhores resultados.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      traduções referindo a fontes antigas\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referências a fontes novas\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=ARQUIVO    biblioteca adicional de traduções de mensagens\n"
+"  -C, --compendium=ARQUIVO    biblioteca adicional de traduções de "
+"mensagens\n"
 "                              pode ser especificada mais de uma vez\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2862,148 +3189,175 @@ msgstr ""
 "  -U, --update                atualiza def.po,\n"
 "                              faz nada se def.po estiver atualizado\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Localização de arquivo de saída no modo de atualização:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "O resultado é escrito de volta no def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROLE       faz um backup do def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIXO         sobrescreve o sufixo padrão do backup\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"O método de controle de versão pode ser selecionado via opção --backup ou pela\n"
+"O método de controle de versão pode ser selecionado via opção --backup ou "
+"pela\n"
 "variável de ambiente VERSION_CONTROL. Aqui estão os valores:\n"
 "  none, off       nunca faz backups (mesmo se --backup for fornecido)\n"
 "  numbered, t     faz backups numerados\n"
 "  existing, nil   numerado se backups numerados existirem; Se não, simples\n"
 "  simple, never   sempre faz backups simples\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "O sufixo de backup é '~', a menos que seja definido com --suffix ou com a\n"
 "variável de ambiente SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 reconhece strings no formato Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              mantém msgids anteriores de mensagens traduzidas\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              mantém msgids anteriores de mensagens "
+"traduzidas\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime indicadores de progresso\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem deveria definir formas de plural"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem não deveria definir formas de plural"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sLeu %ld antigas + %ld referências, mesclou %ld, marcou como aproximadas %ld, perdidas %ld, obsoletas %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLeu %ld antigas + %ld referências, mesclou %ld, marcou como aproximadas "
+"%ld, perdidas %ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " feito.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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 nomes de arquivos explícitos são mutualmente exclusivos"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Converte catálogo de mensagens binário em arquivo .po estilo Uniforum.\n"
+msgstr ""
+"Converte catálogo de mensagens binário em arquivo .po estilo Uniforum.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  modo Java: entrada é uma classe\n"
 "                              ResourceBundle de Java\n"
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                modo C#: entrada é um arquivo .dll de .NET\n"
+msgstr ""
+"      --csharp                modo C#: entrada é um arquivo .dll de .NET\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      modo de recursos C#: entrada é um arquivo\n"
 "                              .resources de .NET\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   modo Tcl: entrada é um arquivo .msg de tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   modo Tcl: entrada é um arquivo .msg de tcl/"
+"msgcat\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ARQUIVO ...                 arquivos .mo de entrada\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Localização do arquivo de entrada em modo Java:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "O nome da classe é determinada pelo anexo do nome da localização ao\n"
 "nome do recurso, separados por um sublinhado. A classe é localizada\n"
 "usando a CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Localização do arquivo de entrada em modo C#:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3012,12 +3366,12 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .dll está localizado em um\n"
 "subdiretório do diretório especificado, cujo nome depende da localização.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Localização do arquivo de entrada em modo Tcl:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3026,18 +3380,18 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .msg está localizado no\n"
 "diretório especificado.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                escreve um estilo de saída com recuo\n"
 
 # Deixei maiúsculo foi todas outras ocorrências de Uniforum estão em assim. - Rafael
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escreve em estilo Uniforum estrito\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3059,19 +3413,21 @@ msgstr ""
 "serão retirados da primeira tradução. Posições de arquivos serão cumuladas.\n"
 "Quando se está usando a opção --unique, duplicatas são descartadas.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              exibe apenas duplicados\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "  -u, --unique                exibe apenas mensagens únicas, descarta\n"
 "                              duplicatas\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3082,8 +3438,9 @@ msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"Codificação de caracteres \"%s\" não é um nome de codificação portável\n"
-"Conversão da mensagem para a codificação do usuário pode não funcionar.\n"
+"O conjunto de caracteres \"%s\" não é um nome de codificação portável.\n"
+"Conversão da mensagem para o conjunto de caracteres do usuário pode não "
+"funcionar.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -3091,7 +3448,7 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"Não há suporte a codificação de caracteres \"%s\". %s depende do iconv(),\n"
+"Não há suporte a conjunto de caracteres \"%s\". %s depende do iconv(),\n"
 "e iconv() não tem suporte a \"%s\".\n"
 
 #: src/po-charset.c:564 src/po-charset.c:612
@@ -3116,7 +3473,7 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"Não há suporte a codificação de caracteres \"%s\". %s depende do iconv().\n"
+"Não há suporte ao conjunto de caracteres \"%s\". %s depende do iconv().\n"
 "Esta versão foi compilada sem iconv().\n"
 
 #: src/po-charset.c:644
@@ -3124,35 +3481,36 @@ msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"Faltando codificação de caracteres no cabeçalho.\n"
-"Conversão da mensagem para a codificação do usuário pode não funcionar.\n"
+"Faltando conjunto de caracteres no cabeçalho.\n"
+"Conversão da mensagem para o conjunto de caracteres do usuário pode não "
+"funcionar.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "seção \"msgstr[]\" não localizada"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "seção \"msgid_plural\" não localizada"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "seção \"msgstr\" não localizada"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primeira forma em plural tem o índice diferente de zero"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma plural tem o índice errado"
@@ -3162,7 +3520,7 @@ msgstr "forma plural tem o índice errado"
 msgid "too many errors, aborting"
 msgstr "excesso de erros - abortando"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequência multi-byte inválida"
@@ -3172,41 +3530,41 @@ msgstr "sequência multi-byte inválida"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência de multi-byte incompleta no final do arquivo"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência de multi-byte incompleta no final da linha"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "falha no iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra-chave \"%s\" desconhecida"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "sequência de controle ilegal"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "fim de arquivo dentro de string"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "fim de linha dentro de string"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separador de contexto <EOT> dentro de string"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este arquivo parece não conter diretivas de domínio"
@@ -3227,48 +3585,63 @@ msgstr "nome de grupo não terminado"
 msgid "invalid non-blank character"
 msgstr "caractere não-vazio inválido"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "faltando \"=\" após \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "linha não-vazia inválida"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "arquivo \"%s\" está truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "arquivo \"%s\" contém string não terminada em NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "arquivo \"%s\" contém string não terminada em NULL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "arquivo \"%s\" não está no formato .mo de GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "arquivo \"%s\" contém string não terminada em NUL, em %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "aviso: sintaxe \\uxxxx inválida para caractere Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: aviso: substituto solitário U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "aviso: caractere Unicode inválido"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "aviso: string não terminada"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "aviso: erro de sintaxe"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "aviso: par chave/valor não terminado"
 
@@ -3276,11 +3649,11 @@ msgstr "aviso: par chave/valor não terminado"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "aviso: erro de sintaxe, esperava \";\" após string"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "aviso: erro de sintaxe, esperada \"=\" ou \";\" após string"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s e %s.\n"
@@ -3289,16 +3662,16 @@ msgstr "Escrito por %s e %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Re-codifica texto sérvio de script em cirílico para latim.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3307,27 +3680,27 @@ msgstr ""
 "O texto de entrada é lido da entrada padrão. O texto convertido é enviado para\n"
 "a saída padrão.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "entrada não é válida na codificação \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao converter da codificação \"%s\" para \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "esperava dois argumentos"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uso: %s [OPÇÃO] URL ARQUIVO\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3336,111 +3709,138 @@ msgstr ""
 "Obtém e envia o conteúdo de uma URL. Se a URL não puder ser acessada,\n"
 "o ARQUIVO acessível localmente é usado.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "erro ao escrever na saída padrão"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "erro após leitura de \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Obtendo %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " tempo esgotado.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " falhou.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Não foi possível enviar múltiplos domínios de tradução em um único arquivo com o formato de saída especificado. Ao invés, tente usar sintaxe de arquivo PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Não foi possível enviar múltiplos domínios de tradução em um único arquivo "
+"com o formato de saída especificado. Ao invés, tente usar sintaxe de arquivo "
+"PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Não foi possível enviar múltiplos domínios de tradução em um único arquivo com o formato de saída especificado."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Não foi possível enviar múltiplos domínios de tradução em um único arquivo "
+"com o formato de saída especificado."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "catálogo de mensagens possui traduções dependentes de contexto, mas o formato de saída não tem suporte a elas."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"catálogo de mensagens possui traduções dependentes de contexto, mas o "
+"formato de saída não tem suporte a elas."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "catálogo de mensagens possui traduções dependentes de contexto, mas o formato de saída não tem suporte a elas. Tente gerar uma classe Java usando \"msgfmt --java\", ao invés de um arquivo de propriedades."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"catálogo de mensagens possui traduções dependentes de contexto, mas o "
+"formato de saída não tem suporte a elas. Tente gerar uma classe Java usando "
+"\"msgfmt --java\", ao invés de um arquivo de propriedades."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "catálogo de mensagens possui traduções em forma de plural, mas o formato de saída não tem suporte a elas."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"catálogo de mensagens possui traduções em forma de plural, mas o formato de "
+"saída não tem suporte a elas."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, 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:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "saída padrão"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "falha ao criar o diretório \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "compilação de classe C# falhou, por favor tente --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "compilação de classe C# falhou"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "erro ao abrir o arquivo \"%s\" para gravação"
+msgstr "erro ao abrir \"%s\" para escrita"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "não é um nome de classe Java válido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "compilação de classe Java falhou, por favor tente --verbose ou tente definir $JAVAC"
+msgstr ""
+"compilação de classe Java falhou, por favor tente --verbose ou tente definir "
+"$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilação de classe Java falhou, por favor tente definir $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "sequência multi-byte incompleta"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "mensagens internacionalizadas não devem conter o caractere de escape \"\\%c\""
+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:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3449,11 +3849,11 @@ msgid ""
 "%s\n"
 msgstr ""
 "O seguinte msgctxt contém caracteres não ASCII.\n"
-"Isso vai causar problemas a tradutores que usem uma codificação de\n"
-"caracteres diferente da sua. Considere usar um msgctxt ASCII puro.\n"
+"Isso vai causar problemas a tradutores que usem um conjunto de\n"
+"caracteres diferente do seu. Considere usar um msgctxt ASCII puro.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3462,8 +3862,8 @@ msgid ""
 "%s\n"
 msgstr ""
 "O seguinte msgid contém caracteres não ASCII.\n"
-"Isso vai causar problemas a tradutores que usem uma codificação de\n"
-"caracteres diferente da sua. Considere usar um msgid ASCII puro.\n"
+"Isso vai causar problemas a tradutores que usem um conjunto de\n"
+"caracteres diferente do seu. Considere usar um msgid ASCII puro.\n"
 "%s\n"
 
 #: src/write-qt.c:668
@@ -3472,15 +3872,18 @@ msgid ""
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 "catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de catálogo de mensagens Qt não tem suporte a manipular plural\n"
+"mas o formato de catálogo de mensagens Qt não tem suporte a manipular "
+"plural\n"
 
 #: src/write-qt.c:694
 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 ""
-"catálogo de mensagens tem strings msgctxt contendo caracteres não ISO-8859-1\n"
+"catálogo de mensagens tem strings msgctxt contendo caracteres não "
+"ISO-8859-1\n"
 "mas o formato de catálogo de mensagens tem suporte a Unicode apenas nas\n"
 "strings traduzidas, não em strings de contexto\n"
 
@@ -3494,12 +3897,12 @@ msgstr ""
 "mas o formato de catálogo de mensagens tem suporte a Unicode apenas nas\n"
 "strings traduzidas, não em strings não traduzidas\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "erro ao gravar no subprocesso de %s"
+msgstr "erro ao escrever no subprocesso %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3507,7 +3910,7 @@ msgstr ""
 "catálogo de mensagens possui traduções dependente de contexto\n"
 "mas o formato .resources C# não tem suporte a contextos\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3515,7 +3918,7 @@ msgstr ""
 "catálogo de mensagens possui traduções em forma de plural,\n"
 "mas o formato de .resources C# não tem suporte a manipular plural\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3523,44 +3926,65 @@ msgstr ""
 "catálogo de mensagens possui traduções dependente de contexto\n"
 "mas o formato de catálogo de mensagens Tcl não tem suporte a contextos\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 "catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de catálogo de mensagens Tcl não tem suporte a manipular plural\n"
+"mas o formato de catálogo de mensagens Tcl não tem suporte a manipular "
+"plural\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: string não terminada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: expressão regular não terminada"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "aviso: caractere Unicode inválido"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: aviso: caractere Unicode inválido"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: aviso: string literal não terminada"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: aviso: string literal não terminada"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: aviso: string literal não terminada"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: constante de caractere não terminada"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal não terminada"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Por favor, especifique a codificação fonte por meio de --from-code"
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3569,7 +3993,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3578,7 +4002,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte longa e incompleta.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3587,7 +4011,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao finado do arquivo.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3596,12 +4020,12 @@ msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao finado da linha.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: falha no iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3610,125 +4034,149 @@ msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte por meio de --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: aviso: caractere Unicode inválido"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: constante de caractere não terminada"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: aviso: \")\" encontrado quando \"}\" era esperado"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: aviso: \"}\" encontrado quando \")\" era esperado"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "\"%s\" não é um nome de codificação válida. Usando ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "verificação de sintaxe \"%s\" desconhecida"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "tipo de fim de sentença \"%s\" desconhecido"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-existing não pode ser usada enquanto a saída é escrita na saída padrão"
+msgstr ""
+"--join-existing não pode ser usada enquanto a saída é escrita na saída padrão"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:705
 #, 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:868
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "aviso: arquivo de regras ITS \"%s\" não existe"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "aviso: arquivo de regras ITS \"%s\" não existe; verifique sua instalação gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"aviso: arquivo de regras ITS \"%s\" não existe; verifique sua instalação "
+"gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:938
 #, 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:1052
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrai strings traduzíveis dos arquivos de entrada passados.\n"
 
 # "messages.po" é, de fato, um nome de um arquivo; não mude isso.
-#: src/xgettext.c:1075
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NOME   usa NOME.po para saída (ao invés de messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NOME   usa NOME.po para saída (ao invés de messages."
+"po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ARQUIVO        escreve a saída para o arquivo especificado\n"
+msgstr ""
+"  -o, --output=ARQUIVO        escreve a saída para o arquivo especificado\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        saída de arquivos serão colocados no\n"
 "                              diretório DIR\n"
 
 # Não é idioma. É linguagem de programação (C, C# etc.), de formatação (HTML etc.), de scripts (Shell script) e por aí vai.
-#: src/xgettext.c:1084
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Escolha da linguagem do arquivo de entrada:\n"
 
-#: src/xgettext.c:1086
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NOME         reconhece a linguagem especificada\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                 EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                 JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                 GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                 EmacsLisp, librep, Scheme, Smalltalk, "
+"Java,\n"
+"                                 JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                 GCC-source, NXStringTable, RST, Glade, "
+"Lua,\n"
 "                                 JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviação para --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
 "Por padrão, a linguagem é adivinhada dependendo da extensão do nome do\n"
 "arquivo de entrada.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3737,49 +4185,54 @@ msgstr ""
 "      --from-code=NOME        codificação dos arquivos de entrada\n"
 "                                (exceto para Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Po padrão, supõe-se que os arquivos de entrada estejam em ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         junta mensagens com arquivo existente\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=arquivo.po\n"
 "                              entradas do ARQUIVO.po não são extraídas\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cTAG, --add-comments=TAG   coloca blocos de comentários começando com TAG e\n"
-"                              precedendo linhas de palavras-chaves no arquivo\n"
+"  -cTAG, --add-comments=TAG   coloca blocos de comentários começando com TAG "
+"e\n"
+"                              precedendo linhas de palavras-chaves no "
+"arquivo\n"
 "                              de saída\n"
-"  -c, --add-comments          coloca todos os blocos de comentários precedendo\n"
-"                              as linhas de palavras-chaves no arquivo de saída\n"
+"  -c, --add-comments          coloca todos os blocos de comentários "
+"precedendo\n"
+"                              as linhas de palavras-chaves no arquivo de "
+"saída\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOME            realiza verificação de sintaxe nas mensagens\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3790,119 +4243,139 @@ msgstr ""
 "                                (single-space, que é o padrão, \n"
 "                                 ou double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opções específicas de linguagens:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrai todas as strings\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (apenas linguagens C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (apenas linguagens C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=PALAVRA:ARG:FLAG\n"
-"                              flag adicional para strings dentro do argumento\n"
+"                              flag adicional para strings dentro do "
+"argumento\n"
 "                              de número ARG da palavra-chave PALAVRA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (apenas linguagens C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                (apenas linguagens C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
 # Trigraphs são seqüências de três caracteres (introduzidos por dois pontos de interrogação consecutivos) que o compilador substitui com seus caracteres de pontuação correspondente
-#: src/xgettext.c:1151
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             entende trigraphs de ANSI C para entrada\n"
+msgstr ""
+"  -T, --trigraphs             entende trigraphs de ANSI C para entrada\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (apenas linguagens C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (apenas linguagens C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=ARQUIVO           aplica regras ITS do ARQUIVO\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (apenas linguagens baseadas em XML)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconhece strings no formato Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (apenas a linguagem C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   reconhece as strings de formato KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 reconhece strings no formato Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 resultado de reconhecimento de string de\n"
 "                              formato mais detalhado\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     escreve em um arquivo .properties de Java\n"
-
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=ARQUIVO           aplica regras ITS do ARQUIVO\n"
+msgstr ""
+"      --properties-output     escreve em um arquivo .properties de Java\n"
 
-#: src/xgettext.c:1198
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               escreve comentários em itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -3910,137 +4383,73 @@ msgstr ""
 "                              define o detentor dos direitos autorais\n"
 "                              na saída\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omite direitos autorais da FSF na saída para\n"
 "                              usuários de fora\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACOTE   define o nome do pacote na saída\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSÃO\n"
 "                              define a versão do pacote na saída\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=E-MAIL@ENDEREÇO\n"
 "                              define o endereço para relatar erros de\n"
 "                              msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -m[STRING], --msgstr-prefix[=STRING]\n"
-"                              usa STRING ou \"\" como prefixo para valores de\n"
+"                              usa STRING ou \"\" como prefixo para valores "
+"de\n"
 "                              msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -M[STRING], --msgstr-suffix[=STRING]\n"
-"                              usa STRING ou \"\" como sufixo para valores de\n"
+"                              usa STRING ou \"\" como sufixo para valores "
+"de\n"
 "                              msgstr\n"
 
-#: src/xgettext.c:2050
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Um argumento de --flag não possui a sintaxe <palavra-chave>:<argnum>:[pass-]<flag>: %s"
-
-#: src/xgettext.c:2175
-msgid "standard input"
-msgstr "entrada padrão"
-
-#: src/xgettext.c:2340
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Caractere não-ASCII em %s%s."
-
-#: src/xgettext.c:2344
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Comentário não ASCII em ou antes de %s%s."
-
-#: src/xgettext.c:2349
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "String não-ASCII em %s%s."
-
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: aviso: "
-
-#: src/xgettext.c:2458
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Apesar de ser usado em uma posição de string de formato, o %s não é uma string de formato válida de %s. Motivo: %s\n"
-
-#: src/xgettext.c:2459
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Apesar de estar declarada assim, o %s não é uma string de formato válida de %s. Motivo: %s\n"
-
-#: src/xgettext.c:2490
+#: src/xgettext.c:1597
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"String de formato de \"%s\" com argumentos sem nome não podem ser localizada\n"
-"adequadamente:\n"
-"O tradutor não pode reordenar os argumentos.\n"
-"Por favor, considere usar uma string de formato com argumentos nomeados,\n"
-"e um mapeamento ao invés de uma tupla de argumentos.\n"
+"Um argumento de --flag não possui a sintaxe <palavra-chave>:<argnum>:"
+"[pass-]<flag>: %s"
 
-#: src/xgettext.c:2555
-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 ""
-"msgid vazio. Ele está reservado pelo GNU gettext:\n"
-"gettext(\"\") retorna a entrada de cabeçalho com\n"
-"informações meta, e não a string vazia.\n"
-
-#: src/xgettext.c:3292
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "especificação de argumento ambíguo para a palavra-chave \"%.*s\""
-
-#: src/xgettext.c:3319
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
-
-#: src/xgettext.c:3344
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
-
-#: src/xgettext.c:3365
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "contexto não confere para formas singular e plural"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "entrada padrão"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4052,21 +4461,16 @@ msgstr ""
 "especifique lá a variável MSGID_BUGS_ADDRESS; Senão por favor\n"
 "especifique uma opção de linha de comando --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "idioma \"%s\" desconhecido"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: aviso: substituto solitário U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Por favor, especifique a codificação fonte por meio de --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4075,7 +4479,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4084,7 +4488,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte longa e incompleta.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4093,7 +4497,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao final do arquivo.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4102,7 +4506,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao final da linha.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4111,70 +4515,82 @@ msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte por meio de --from-code.\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: aviso: RegExp literal terminada muito cedo"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: aviso: %s não é permitido"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: aviso: marcação XML indeterminada"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: não foi possível localizar terminador de string \"%s\" em lugar nenhum antes do fim do arquivo"
+msgstr ""
+"%s:%d: não foi possível localizar terminador de string \"%s\" em lugar "
+"nenhum antes do fim do arquivo"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: faltando chave da direita em \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolação (\"\\l\") inválida de caractere de 8bit \"%c\""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolação (\"\\u\") inválida de caractere de 8bit \"%c\""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolação de variável inválida em \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolação (\"\\L\") inválida de caractere de 8bit \"%c\""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolação (\"\\U\") inválida de caractere de 8bit \"%c\""
 
 #: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Por favor, especifique a codificação fonte por meio de --from-code ou um\n"
 "comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code\n"
@@ -4182,11 +4598,16 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Sequência longa de multi-byte incompleta.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code\n"
@@ -4194,11 +4615,16 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao final do arquivo.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code\n"
@@ -4206,11 +4632,16 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao final da linha.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code\n"
@@ -4218,43 +4649,69 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte por meio de --from-code\n"
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codificação desconhecida \"%s\". Procedendo com ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definição de string inválida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: faltando número após #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expressão de string inválida"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: definição de string inválida"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: definição de string inválida"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: aviso: a sintaxe $\"...\" está obsoleta por motivos de segurança; ao invés disso, use eval_gettext"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: aviso: a sintaxe $\"...\" está obsoleta por motivos de segurança; ao "
+"invés disso, use eval_gettext"
+
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: aviso: expressão regular literal terminada muito cedo"
@@ -4385,6 +4842,106 @@ msgstr "dentro de uma instrução de processamento ou comentário"
 msgid "document ended unexpectedly: %s"
 msgstr "documento terminou inesperadamente: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção \"--%s\" não permite um argumento\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: opção desconhecida \"--%s\"\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: opção \"-W %s\" é ambígua\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: a opção \"-W %s\" exige um argumento\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "aviso: cabeçalho de arquivo PO como tradução aproximada (fuzzy)\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "aviso: versões mais antigas do msgfmt vão dar um erro nisso\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Caractere não-ASCII em %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Comentário não ASCII em ou antes de %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "String não-ASCII em %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: aviso: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Apesar de ser usado em uma posição de string de formato, o %s não é uma "
+#~ "string de formato válida de %s. Motivo: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Apesar de estar declarada assim, o %s não é uma string de formato válida "
+#~ "de %s. Motivo: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "String de formato de \"%s\" com argumentos sem nome não podem ser "
+#~ "localizada\n"
+#~ "adequadamente:\n"
+#~ "O tradutor não pode reordenar os argumentos.\n"
+#~ "Por favor, considere usar uma string de formato com argumentos nomeados,\n"
+#~ "e um mapeamento ao invés de uma tupla de argumentos.\n"
+
+#~ 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 ""
+#~ "msgid vazio. Ele está reservado pelo GNU gettext:\n"
+#~ "gettext(\"\") retorna a entrada de cabeçalho com\n"
+#~ "informações meta, e não a string vazia.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "especificação de argumento ambíguo para a palavra-chave \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "contexto não confere para formas singular e plural"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
 #~ msgstr "O elemento raiz <%s> não é permitido em um arquivo CLDR válido"
 
@@ -4405,7 +4962,8 @@ msgstr "documento terminou inesperadamente: %s"
 #~ msgstr "campo de cabeçalho \"%s\" deveria começar no início da linha\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões\n"
+#~ msgstr ""
+#~ "alguns campos do cabeçalho ainda possuem os valores iniciais padrões\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opção ilegal -- %c\n"
@@ -4416,12 +4974,16 @@ msgstr "documento terminou inesperadamente: %s"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não existe\n"
-#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n"
+#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não "
+#~ "existe\n"
+#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA "
+#~ "FINALIDADE.\n"
 
 #, fuzzy
 #~ msgid "%s:%lu: warning: unterminated string"
@@ -4435,10 +4997,12 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
@@ -4446,15 +5010,18 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "Uso: %s [OPÇÃO] def.po ref.po\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\n"
+#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "
+#~ "arquivos de entrada\n"
 #~ "  -e, --no-escape          não utilizar escapes C na saída (padrão)\n"
-#~ "  -E, --escape             usar escapes C na saída sem caracteres estendidos\n"
+#~ "  -E, --escape             usar escapes C na saída sem caracteres "
+#~ "estendidos\n"
 #~ "      --force-po           grava o arquivo .po mesmo que vazio\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
 #~ "  -i, --indent             estilo de saída indentado\n"
 #~ "  -o, --output-file=ARQ    resultado será gravado em ARQ\n"
 #~ "      --no-location        suprime as linhas '#: arquivo:linha'\n"
-#~ "      --add-location       preserva as linhas '#: arquivo:linha' (padrão)\n"
+#~ "      --add-location       preserva as linhas '#: arquivo:"
+#~ "linha' (padrão)\n"
 #~ "  -S, --strict             habilita o modo Uniforum estrito\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 
@@ -4474,32 +5041,43 @@ msgstr "documento terminou inesperadamente: %s"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] [[[DOMÍNIO] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-#~ "  -e                        permite a expansão de alguns caracteres de escape\n"
+#~ "  -e                        permite a expansão de alguns caracteres de "
+#~ "escape\n"
 #~ "  -E                        (ignorado para compatibilidade)\n"
 #~ "  -h, --help                apresenta esta ajuda e finaliza\n"
 #~ "  -n                        suprime caractere de nova linha\n"
 #~ "  -v, --version             apresenta versão e finaliza\n"
-#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
+#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas "
+#~ "correspondentes\n"
 #~ "                            para MSGID no DOMÍNIO\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Caso o parâmetro DOMÍNIO não seja informado este será determinado através da\n"
-#~ "variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for encontrado\n"
+#~ "Caso o parâmetro DOMÍNIO não seja informado este será determinado através "
+#~ "da\n"
+#~ "variável de ambiente TEXTDOMAIN. Se o catálogo de mensagens não for "
+#~ "encontrado\n"
 #~ "no diretório padrão, outra localização pode ser especificada na variável\n"
 #~ "TEXTDOMAINDIR.\n"
-#~ "Quando utilizado com a opção -s o programa comporta-se como um comando echo.\n"
-#~ "Mas não somente copiando seus parâmetros para stdout, e sim traduzindo as\n"
+#~ "Quando utilizado com a opção -s o programa comporta-se como um comando "
+#~ "echo.\n"
+#~ "Mas não somente copiando seus parâmetros para stdout, e sim traduzindo "
+#~ "as\n"
 #~ "mensagens encontradas no catálogo selecionado\n"
 #~ "Diretório de pesquisa padrão: %s\n"
 
@@ -4511,23 +5089,23 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "  -h, --help                display this help and exit\n"
 #~ "  -V, --version             display version information and exit\n"
 #~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO] [[[DOMÍNIO] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=DOMÍNIO      recupera mensagens traduzidas em DOMÍNIO\n"
-#~ "  -e                        permite a expansão de alguns caracteres de escape\n"
+#~ "  -e                        permite a expansão de alguns caracteres de "
+#~ "escape\n"
 #~ "  -E                        (ignorado para compatibilidade)\n"
 #~ "  -h, --help                apresenta esta ajuda e finaliza\n"
 #~ "  -n                        suprime caractere de nova linha\n"
 #~ "  -v, --version             apresenta versão e finaliza\n"
-#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas correspondentes\n"
+#~ "  [DOMÍNIO] MSGID           recupera mensagens traduzidas "
+#~ "correspondentes\n"
 #~ "                            para MSGID no DOMÍNIO\n"
 
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "arquivo \"%s\" contém string não terminada em NULL"
-
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "falha na pesquisa \"%s\" offset %ld"
 
@@ -4557,12 +5135,16 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -4575,34 +5157,46 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Uso: %s [OPÇÃO]  arquivo.po ...\n"
-#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de texto.\n"
+#~ "Gera catálogo de mensagens binárias a partir da descrição de tradução de "
+#~ "texto.\n"
 #~ "\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"
-#~ "  -c, --check              executa conferências dependentes de linguagem em strings\n"
-#~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de arquivos de entrada\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 "
+#~ "arquivos de entrada\n"
 #~ "  -f, --use-fuzzy          use entradas aproximadas (fuzzy) na saída\n"
 #~ "  -h, --help               apresenta esta ajuda e finaliza\n"
-#~ "      --no-hash            arquivos binários não serão incluídos na tabela hash\n"
+#~ "      --no-hash            arquivos binários não serão incluídos na "
+#~ "tabela hash\n"
 #~ "  -o, --output-file=ARQ    especifica o nome do arquivo de saída ARQ\n"
 #~ "      --statistics         mostra estatísticas das traduções\n"
 #~ "      --strict             habilita o modo Uniforum estrito\n"
 #~ "  -v, --verbose            lista problemas do arquivo de entrada\n"
 #~ "  -V, --version            apresenta informações de versão e finaliza\n"
 #~ "\n"
-#~ "Informando a opção -v mais que uma vez as mensagens de saída são incrementadas\n"
+#~ "Informando a opção -v mais que uma vez as mensagens de saída são "
+#~ "incrementadas\n"
 #~ "\n"
-#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de saída\n"
+#~ "Se o arquivo de entrada é -, a entrada padrão é lida. Caso o arquivo de "
+#~ "saída\n"
 #~ "seja - as mensagens serão geradas na saída padrão\n"
 
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -4610,24 +5204,29 @@ msgstr "documento terminou inesperadamente: %s"
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             adicionar linhas '#: arquivo:linha' (default)\n"
+#~ "  -n, --add-location             adicionar linhas '#: arquivo:"
+#~ "linha' (default)\n"
 #~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
 #~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
 #~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo duplicidades\n"
+#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
 #~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
 #~ "  -V, --version                  apresenta informação de versão e sai\n"
-#~ "  -n, --add-location             adicionar linhas '#: arquivo:linha' (default)\n"
+#~ "  -n, --add-location             adicionar linhas '#: arquivo:"
+#~ "linha' (default)\n"
 #~ "      --omit-header              não gravar cabeçalho com `msgid \"\"' \n"
 #~ "  -o, --output=ARQ               grava saída para o arquivo especificado\n"
 #~ "  -p, --output-dir=DIR           arquivos de saída serão gravados em DIR\n"
-#~ "  -s, --sort-output              gera saída ordenada, removendo duplicidades\n"
+#~ "  -s, --sort-output              gera saída ordenada, removendo "
+#~ "duplicidades\n"
 #~ "      --strict                   grava arquivo .po em estilo Uniforum\n"
 #~ "  -T, --trigraphs                entende trígrafos ANSI C na entrada\n"
 #~ "  -V, --version                  apresenta informação de versão e sai\n"
 #~ "  -w, width=NÚMERO               configura a largura da página de saída\n"
-#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são extraídas\n"
+#~ "  -x, --exclude-file=ARQ         entradas do arquivo ARQ não são "
+#~ "extraídas\n"
 #~ "\n"
 #~ "Se ARQUIVO DE ENTRADA é -, a entrada padrão é lida.\n"
 
diff --git a/gettext-tools/po/ro.po b/gettext-tools/po/ro.po
index 236c40abe..033b8b626 100644
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
-"POT-Creation-Date: 2003-11-18 17:10+0100\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
@@ -14,572 +15,1200 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/argmatch.c:120
-#, c-format
-msgid "invalid argument `%s' for `%s'"
+#: gnulib-lib/argmatch.c:134
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid argument %s for %s"
 msgstr "parametru invalid `%s' pentru `%s'"
 
-#: lib/argmatch.c:121
-#, c-format
-msgid "ambiguous argument `%s' for `%s'"
+#: gnulib-lib/argmatch.c:135
+#, fuzzy, c-format
+#| msgid "ambiguous argument `%s' for `%s'"
+msgid "ambiguous argument %s for %s"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: lib/argmatch.c:139
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Parametrii valizi sunt: "
 
-#: lib/closeout.c:66
+#: gnulib-lib/clean-temp.c:325
+#, 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:339
+#, 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:435
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot remove temporary file %s"
+msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
+
+#: gnulib-lib/clean-temp.c:450
+#, fuzzy, c-format
+#| msgid "cannot create a temporary directory using template \"%s\""
+msgid "cannot remove temporary directory %s"
+msgstr ""
+"nu se poate crea un director temporar folosind modelul(template) \"%s\""
+
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
 
-#: lib/copy-file.c:72
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"
 msgstr "nu se poate deschide fi�ierul de backup \"%s\" pentru scriere"
 
-#: lib/copy-file.c:80 src/urlget.c:212
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "eroare �n citirea lui \"%s\""
 
-#: lib/copy-file.c:85 lib/copy-file.c:89
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "eroare �n scrierea lui \"%s\""
 
-#: lib/copy-file.c:91 src/urlget.c:222
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "eroare dup� citirea lui \"%s\""
 
-#: lib/error.c:137 lib/error.c:165
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() e�uat"
+
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgid "C# compiler not found, try installing mono"
+msgstr ""
+"Nu a fost g�sit compilatorul Java, �ncerca�i s� instala�i gcj sau seta�i "
+"$JAVAC"
+
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgid "C# virtual machine not found, try installing mono"
+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:195
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
-#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
-#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:329 lib/wait-process.c:392
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprocesul %s a e�uat"
 
-#: lib/getopt.c:689 lib/getopt.c:701
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: op�iunea `%s' este ambigu�\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: lib/getopt.c:734 lib/getopt.c:738
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: op�iune necunoscut� `%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
+
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: op�iunea `%s' necesit� un parametru\n"
+
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: optiune invalid� -- %c\n"
+
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: op�iunea necesit� un parametru -- %c\n"
+
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `--%s' nu permite parametri\n"
+msgid "invalid source_version argument to compile_java_class"
+msgstr ""
 
-#: lib/getopt.c:747 lib/getopt.c:752
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
+msgid "invalid target_version argument to compile_java_class"
+msgstr ""
 
-#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un parametru\n"
+msgid "failed to create \"%s\""
+msgstr "eroare �n crearea \"%s\""
 
-#: lib/getopt.c:839 lib/getopt.c:842
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op�iune necunoscut� `--%s'\n"
+msgid "error while writing \"%s\" file"
+msgstr "eroare �n scrierea fi�ierului \"%s\""
 
-#: lib/getopt.c:850 lib/getopt.c:853
+#: gnulib-lib/javacomp.c:2436
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op�iune necunoscut� `%c%s'\n"
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr ""
+"Nu a fost g�sit compilatorul Java, �ncerca�i s� instala�i gcj sau seta�i "
+"$JAVAC"
 
-#: lib/getopt.c:900 lib/getopt.c:903
+#: gnulib-lib/javaexec.c:417
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr ""
+"Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� "
+"seta�i $JAVA"
 
-#: lib/getopt.c:909 lib/getopt.c:912
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: optiune invalid� -- %c\n"
+msgid "%s subprocess I/O error"
+msgstr "eroare I/O a subprocesului %s"
 
-#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: op�iunea necesit� un parametru -- %c\n"
+msgid "memory exhausted"
+msgstr "memorie plin�"
 
-#: lib/getopt.c:1022 lib/getopt.c:1033
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+msgid "creation of threads failed"
+msgstr ""
 
-#: lib/getopt.c:1057 lib/getopt.c:1069
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
+msgid "write to %s subprocess failed"
+msgstr "scrierea �n subprocesul %s e�uat�"
 
-#: lib/javacomp.c:457
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Nu a fost g�sit compilatorul Java, �ncerca�i s� instala�i gcj sau seta�i $JAVAC"
+msgid "read from %s subprocess failed"
+msgstr "citirea din subprocesul %s a e�uat"
 
-#: lib/javaexec.c:407
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
-msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� seta�i $JAVA"
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
 
-#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:51 lib/xmalloc.c:41
-#: lib/xsetenv.c:40 src/po-lex.c:89 src/po-lex.c:118 src/x-glade.c:390
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
-msgid "memory exhausted"
-msgstr "memorie plin�"
+msgid "communication with %s subprocess failed"
+msgstr "comunica�ia cu subprocesul %s a e�uat"
 
-#: lib/pipe-bidi.c:129 lib/pipe-bidi.c:131 lib/pipe-bidi.c:206
-#: lib/pipe-bidi.c:208 lib/pipe-in.c:142 lib/pipe-in.c:219 lib/pipe-out.c:142
-#: lib/pipe-out.c:219
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
-msgid "cannot create pipe"
-msgstr "nu se poate crea leg�tura(pipe)"
+msgid "%s subprocess terminated with exit code %d"
+msgstr "subprocesul %s s-a terminat cu cod de ie�ire %d"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#.
+#. If you don't know what to put here, please see
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: gnulib-lib/quotearg.c:362
+msgid "`"
+msgstr ""
 
-#: lib/w32spawn.h:48
+#: gnulib-lib/quotearg.c:363
+msgid "'"
+msgstr ""
+
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle a e�uat cu cod de eroare 0x%08x"
+msgid "setting permissions for %s"
+msgstr ""
 
-#: lib/w32spawn.h:53
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "nu se poate crea leg�tura(pipe)"
+
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a e�uat"
 
-#: lib/wait-process.c:276 lib/wait-process.c:308 lib/wait-process.c:362
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocesul %s"
 
-#: lib/wait-process.c:321 lib/wait-process.c:384
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subprocesul %s a primit semnalul fatal %d"
 
-#: src/format-awk.c:493 src/format-elisp.c:341 src/format-librep.c:305
-#: src/format-pascal.c:394 src/format-perl.c:571 src/format-php.c:341
-#: src/format-qt.c:136 src/format-tcl.c:380 src/format-ycp.c:137
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "o specifica�ie de formatare pentru parametrul %u, ca �n `%s', nu exist� �n 'msgid'"
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
 
-#: src/format-awk.c:508 src/format-elisp.c:356 src/format-librep.c:320
-#: src/format-pascal.c:409 src/format-perl.c:586 src/format-php.c:356
-#: src/format-qt.c:135 src/format-tcl.c:395 src/format-ycp.c:136
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Folosire: %s [OP�IUNE] [FI�IER]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru op�iunile\n"
+"scurte. Similar pentru argumentele op�ionale.\n"
+
+#: src/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, 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"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Scris de %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr ""
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
+
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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'"
+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:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:533 src/format-c.c:846 src/format-elisp.c:381
-#: src/format-gcc-internal.c:283 src/format-librep.c:345
-#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
-#: src/format-python.c:530 src/format-tcl.c:420
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "specifica�iile de formatare din 'msgid' �i '%s' pentru argumentul %u sunt diferite"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 ""
+"specifica�iile de formatare din 'msgid' �i '%s' pentru argumentul %u sunt "
+"diferite"
+
+#: src/format-boost.c:449
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, the width's argument number 0 is not a "
+#| "positive integer."
+msgid "The directive number %u starts with | but does not end with |."
+msgstr ""
+"�n num�rul de directiv� %u, num�rul m�rimii argumentului 0 nu este un �ntreg "
+"pozitiv."
+
+#: src/format.c:152
+#, 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' nu este un format valid de �ir %s, spre deosebire de 'msgid'. Motiv: %s"
 
-#: src/format-c.c:177
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "In directiva num�rul %u, marcajul(token) de dup� '<' nu este numele unui macro de formatare specificat. Numele valide de macro-uri sunt listate �n ISO C 99 sec�iunea 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"In directiva num�rul %u, marcajul(token) de dup� '<' nu este numele unui "
+"macro de formatare specificat. Numele valide de macro-uri sunt listate �n "
+"ISO C 99 sec�iunea 7.8.1."
 
-#: src/format-c.c:546
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "�n directiva num�rul %u, marcajul(token) de dup� '<' nu este urmat de '>'."
+msgstr ""
+"�n directiva num�rul %u, marcajul(token) de dup� '<' nu este urmat de '>'."
 
-#: src/format-c.c:753
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"�irul are referire la argumentul num�rul %u dar ignor� argumentul num�rul %u."
 
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, 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 "num�rul de specifica�ii de formatare din 'msgid' �i '%s' este diferit"
 
-#: src/format-gcc-internal.c:204
+#: src/format-csharp.c:85 src/format-java.c:205
+#, c-format
+msgid "In the directive number %u, '{' is not followed by an argument number."
+msgstr "�n num�rul de directiv� %u, '{' nu este urmat de un num�r de argument."
+
+#: src/format-csharp.c:106
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, ',' is not followed by a number."
+msgstr "�n num�rul de directiv� %u, '{' nu este urmat de un num�r de argument."
+
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"�irul se termin� �n mijlocul directivei: s-a g�sit '{' f�r� '}' potrivit."
+
+#: src/format-csharp.c:136
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, the character '%c' is not a digit between 1 "
+#| "and 9."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"�n directiva num�rul %u, caracterul '%c' nu este un digitit �ntre 1 �i 9."
+
+#: src/format-csharp.c:137
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '~;' is used in an invalid position."
+msgid "The directive number %u ends with an invalid character instead of '}'."
+msgstr "�n directiva num�rul %u  '~,' este folosit� �ntr-o pozi�ie invalid�."
+
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"�irul �ncepe �n mijlocul directivei: s-a g�sit '}' f�r� a se g�si '{' "
+"potrivit."
+
+#: src/format-csharp.c:159
+#, fuzzy, c-format
+#| msgid "The string ends in the middle of a directive."
+msgid "The string contains a lone '}' after directive number %u."
+msgstr "�irul se termin� �n mijlocul directivei."
+
+#: src/format-gcc-internal.c:255
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+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:292
+#, fuzzy, c-format
+#| msgid "In the directive number %u, flags are not allowed before '%c'."
+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:334
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, the argument number 0 is not a positive "
+#| "integer."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"�n directiva num�rul %u, num�rul de argument 0 nu este un �ntreg pozitiv."
+
+#: src/format-gcc-internal.c:398
+#, fuzzy, c-format
+#| msgid "In the directive number %u, flags are not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification 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:406
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+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: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'."
+msgstr ""
+"�n num�rul de directiv� %u, marcajele(flags) nu sunt admise �nainte de '%c'."
+
+#: src/format-gcc-internal.c:677
+#, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr ""
+
+#: src/format-gcc-internal.c:680
+#, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr ""
+
+#: src/format-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "�irul se termin� �n mijlocul directivei."
 
-#: src/format-invalid.h:26
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "�irul are referire la argumente at�t prin numere absolute de argument c�t �i prin specifica�ii de argument nenumerotate."
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"�irul are referire la argumente at�t prin numere absolute de argument c�t �i "
+"prin specifica�ii de argument nenumerotate."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "�n directiva num�rul %u, num�rul de argument 0 nu este un �ntreg pozitiv."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"�n directiva num�rul %u, num�rul de argument 0 nu este un �ntreg pozitiv."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "�n num�rul de directiv� %u, num�rul m�rimii argumentului 0 nu este un �ntreg pozitiv."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"�n num�rul de directiv� %u, num�rul m�rimii argumentului 0 nu este un �ntreg "
+"pozitiv."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "�n num�rul de directiv� %u, num�rul preciziei argumentului 0 nu este un �ntreg pozitiv."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"�n num�rul de directiv� %u, num�rul preciziei argumentului 0 nu este un "
+"�ntreg pozitiv."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "�n directiva num�rul %u, caracterul '%c' nu este un specificator de conversie valid."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"�n directiva num�rul %u, caracterul '%c' nu este un specificator de "
+"conversie valid."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Caracterul care finalizeaz� num�rul de directiv� %u nu este un specificator de conversie valid."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Caracterul care finalizeaz� num�rul de directiv� %u nu este un specificator "
+"de conversie valid."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "�ir are referire la num�rul de argument %u prin metode incompatibile."
 
-#: src/format-java.c:190
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "�irul se termin� �n mijlocul directivei: s-a g�sit '{' f�r� '}' potrivit."
-
-#: src/format-java.c:203
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "�n num�rul de directiv� %u, '{' nu este urmat de un num�r de argument."
-
-#: src/format-java.c:236
-#, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "�n num�rul de directiv� %u, sub�irul \"%s\" nu este un stil valid de dat�/or�."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"�n num�rul de directiv� %u, sub�irul \"%s\" nu este un stil valid de dat�/"
+"or�."
 
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "�n num�rul de directiv� %u. \"%s\" nu este urmat de o virgul�."
 
-#: src/format-java.c:266
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "�n num�rul de directiv� %u, sub�irul \"%s\" nu este un stil valid de num�r."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"�n num�rul de directiv� %u, sub�irul \"%s\" nu este un stil valid de num�r."
 
-#: src/format-java.c:305
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "�n num�rul de directiv� %u, num�rul de argument nu este urmat de o virgul� �i unul dintre \"%s\", \"%s\",\"%s\",\"%s\"."
-
-#: src/format-java.c:322
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "�irul �ncepe �n mijlocul directivei: s-a g�sit '}' f�r� a se g�si '{' potrivit."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"�n num�rul de directiv� %u, num�rul de argument nu este urmat de o virgul� "
+"�i unul dintre \"%s\", \"%s\",\"%s\",\"%s\"."
 
-#: src/format-java.c:546
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "�n num�rul de directiv� %u, alegerea nu con�ine num�r."
 
-#: src/format-java.c:557
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "�n num�rul de directiv� %u, o alegere con�ine un num�r care nu este urmat de '<', '#' sau '%s'."
-
-#: src/format-java.c:715
-#, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
-msgstr "o specifica�ie de formatare pentru argumentul {%u}, ca �n '%s', nu exist� �n 'msgid'"
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"�n num�rul de directiv� %u, o alegere con�ine un num�r care nu este urmat de "
+"'<', '#' sau '%s'."
+
+#: src/format-java.c:745
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#| "'msgid'"
+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:730
+#: 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:755
-#, c-format
-msgid "format specifications in 'msgid' 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"
+#: src/format-java.c:776
+#, 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 ""
+"specifica�iile de format din 'msgid' �i '%s' pentru argument {%u} nu sunt la "
+"fel"
 
-#: src/format-lisp.c:2354 src/format-lisp.c:2366
-#, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "�n directiva num�rul %u, parametrul %u este de tipul '%s' dar se a�tepta parametru de tipul %s."
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"�irul are referire la argumentul num�rul %u dar ignor� argumentul num�rul %u."
 
-#: src/format-lisp.c:2389
-#, c-format
-msgid "In the directive number %u, too many parameters are given; expected at most %u parameters."
-msgstr "�n directiva num�rul %u sunt furniza�i prea mul�i parametri; se a�teptau cel mult %u parametrii."
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"o specifica�ie de formatare pentru parametrul %u, ca �n `%s', nu exist� �n "
+"'msgid'"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "eroare �n timpul citirii \"%s\""
 
-#: src/format-lisp.c:2501
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
+#, c-format
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"�n directiva num�rul %u, parametrul %u este de tipul '%s' dar se a�tepta "
+"parametru de tipul %s."
+
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, too many parameters are given; expected at "
+#| "most %u parameters."
+msgid ""
+"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."
+msgstr[0] ""
+"�n directiva num�rul %u sunt furniza�i prea mul�i parametri; se a�teptau cel "
+"mult %u parametrii."
+msgstr[1] ""
+"�n directiva num�rul %u sunt furniza�i prea mul�i parametri; se a�teptau cel "
+"mult %u parametrii."
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "�n directiva num�rul %u, '%c' nu este urmat de un digit."
 
-#: src/format-lisp.c:2699
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "�n directiva num�rul %u parametrul %d este negativ."
 
-#: src/format-lisp.c:2761
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "�irul se termin� �n mijlocul unei directive ~/../."
 
-#: src/format-lisp.c:2791 src/format-lisp.c:3014 src/format-lisp.c:3120
-#: src/format-lisp.c:3169 src/format-lisp.c:3255
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "S-a g�sit '~%c' f�r� '~%c' corespunz�tor."
 
-#: src/format-lisp.c:2807
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "�n directiva num�rul %u sunt specifica�i ambii modificatori @ �i : ."
 
-#: src/format-lisp.c:2905
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "�n directiva num�rul %u '~[' nu este urmat de dou� clauze, separate prin '~,'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"�n directiva num�rul %u '~[' nu este urmat de dou� clauze, separate prin "
+"'~,'."
 
-#: src/format-lisp.c:3203
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "�n directiva num�rul %u  '~,' este folosit� �ntr-o pozi�ie invalid�."
 
-#: src/format-lisp.c:3289
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr "�irul se refer� la anumite argumente �n moduri incompatibile."
 
-#: src/format-lisp.c:3333
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, fuzzy, c-format
+#| msgid "format specifications in 'msgid' and '%s' are not equivalent"
+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:3354
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "specifica�iile de format din '%s' nu sunt subset al acelora din 'msgid'"
-
-#: src/format-perl.c:428
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "�n directiva num�rul %u, specificatorul de m�rime este incompatibil cu specificatorul de conversie '%c'."
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, 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 ""
+"specifica�iile de format din '%s' nu sunt subset al acelora din 'msgid'"
 
-#: src/format-perl-brace.c:198 src/format-python.c:462 src/format-sh.c:304
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "�irul se refer� la argumente at�t prin numele argumentelor c�t �i prin specifica�ii de argument nenominalizate."
-
-#: src/format-python.c:329
+#: src/format-perl.c:433
 #, 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."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"�n directiva num�rul %u, specificatorul de m�rime este incompatibil cu "
+"specificatorul de conversie '%c'."
 
-#: src/format-python.c:407
-#, c-format
-msgid "format specifications in 'msgid' 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-brace.c:138
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "�n directiva num�rul %u, '%c' nu este urmat de un digit."
 
-#: src/format-python.c:419
-#, c-format
-msgid "format specifications in 'msgid' 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-brace.c:157
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "�n num�rul de directiv� %u, '{' nu este urmat de un num�r de argument."
 
-#: src/format-python.c:447 src/format-sh.c:289
-#, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
-msgstr "specificarea de formatare pentru argumentul '%s', precum �n '%s' nu exist� �n 'msgid'"
+#: src/format-python-brace.c:171
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "�n directiva num�rul %u, '%c' nu este urmat de un digit."
+
+#: src/format-python-brace.c:193
+#, fuzzy, c-format
+#| msgid "In the directive number %u, flags are not allowed before '%c'."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"�n num�rul de directiv� %u, marcajele(flags) nu sunt admise �nainte de '%c'."
+
+#: src/format-python-brace.c:278
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "�n directiva num�rul %u parametrul %d este negativ."
+
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"�irul se refer� la argumente at�t prin numele argumentelor c�t �i prin "
+"specifica�ii de argument nenominalizate."
 
-#: src/format-python.c:488
+#: src/format-python.c:354
 #, c-format
-msgid "format specifications in 'msgid' 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"
+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:430
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#| "tuple"
+msgid ""
+"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:437
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#| "mapping"
+msgid ""
+"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:460 src/format-sh.c:297
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument '%s', as in '%s', doesn't exist in "
+#| "'msgid'"
+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:494
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#| "same"
+msgid ""
+"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"
 
-#: src/format-qt.c:80
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Referin�e multiple la % % %c."
+msgid ""
+"'%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:82
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "�irul se refer� la o variabil� de shell cu un nume non-ASCII."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "�irul se refer� la o variabil� de shell cu o sintax� complex� cu acolade. Aceast� sintax� nu este suportat� din motive de securitate."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"�irul se refer� la o variabil� de shell cu o sintax� complex� cu acolade. "
+"Aceast� sintax� nu este suportat� din motive de securitate."
 
-#: src/format-sh.c:86
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "�irul se refer� la o variabil� de shell a c�rei valoare poate fi diferit� �n func�iile de shell."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"�irul se refer� la o variabil� de shell a c�rei valoare poate fi diferit� �n "
+"func�iile de shell."
 
-#: src/format-sh.c:88
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "�irul se refer� la o variabil� de shell cu un nume gol."
 
-#: src/format-ycp.c:85
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "�n directiva num�rul %u, caracterul '%c' nu este un digitit �ntre 1 �i 9."
-
-#: src/format-ycp.c:86
-#, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Caracterul care termin� directiva num�rul %u nu este un digit �ntre 1 �i 9."
-
-#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
-#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
-#, c-format, no-wrap
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Acesta este software liber; citi�i sursa pentru condi�ii de copiere.  NU exist� NICI o \n"
-"garan�ie; nici m�car pentru VANDABILITATE sau MODIFICARE �NTR-UN SCOP PRIVAT.\n"
+"�n directiva num�rul %u, caracterul '%c' nu este un digitit �ntre 1 �i 9."
 
-#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
-#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/format-ycp.c:91
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Scris de %s.\n"
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Caracterul care termin� directiva num�rul %u nu este un digit �ntre 1 �i 9."
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
+msgid "Bruno Haible"
+msgstr ""
 
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
-#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
-
-#: src/hostname.c:214 src/msginit.c:360
-#, c-format
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Afi�eaz� numele de host al ma�inii.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de ie�ire(output):\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           nume de host scurtat\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long    nume lung de host, incluz�nd numele de domeniu complet calificat,\n"
+"  -f, --fqdn, --long    nume lung de host, incluz�nd numele de domeniu "
+"complet calificat,\n"
 "                          �i aliasurile\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
-#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
-#, c-format
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
+#, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ie�ire(output) informativ�:\n"
 
-#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
-#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
+msgid "could not get host name"
+msgstr "nu s-a putut afla numele de host"
+
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "cel pu�in dou� fi�iere trebuie specificate"
+
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "nu se poate crea leg�tura(pipe)"
 
-#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
-#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/its.c:344
 #, c-format
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               afi�eaz� informa�ii despre versiune �i iese\n"
+msgid "cannot evaluate XPath expression: %s"
+msgstr ""
 
-#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
-#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "parametru invalid `%s' pentru `%s'"
 
-#: src/hostname.c:254 src/hostname.c:260 src/hostname.c:267
+#: src/its.c:1418
 #, c-format
-msgid "could not get host name"
-msgstr "nu s-a putut afla numele de host"
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "nu se poate crea leg�tura(pipe)"
 
-#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
+
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cel mult un fi�ier de intrare(input) este permis"
 
-#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
-#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
-#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �i %s se exclud reciproc"
 
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]\n"
 
-#: src/msgattrib.c:381
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -588,280 +1217,381 @@ msgstr ""
 "Filtreaz� mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "�i manipuleaz� atributele.\n"
 
-#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
-#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
-#: src/msguniq.c:320
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Parametrii obligatorii la op�iunile lungi sunt obligatorii �i la op�iunile scurte.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Parametrii obligatorii la op�iunile lungi sunt obligatorii �i la op�iunile "
+"scurte.\n"
 
-#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
-#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Loca�ie fi�ier intrare(input):\n"
 
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FI�IER_INTRARE                   fi�ier de intrare(input) PO\n"
 
-#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
-#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DIRECTOR   adaug� DIRECTOR �n lista de c�utare a fi�ierelor de intrare\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DIRECTOR   adaug� DIRECTOR �n lista de c�utare a "
+"fi�ierelor de intrare\n"
 
-#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Dac� nu este dat nici un fi�ier de intrare sau este -, se va citi "
+"intrarea(input) standard.\n"
 
-#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Loca�ie fi�ier ie�ire(output):\n"
 
-#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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"
+msgstr ""
+"  -o, --output-file=FI�IER      scrie output-ul �n fi�ierul specificat\n"
 
-#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Rezultatele sunt scrise la standard output dac� nu este specificat nici un fi�ier\n"
+"Rezultatele sunt scrise la standard output dac� nu este specificat nici un "
+"fi�ier\n"
 "de ie�ire(output) sau dac� acesta este -.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:370 src/msgcomm.c:375 src/msguniq.c:340
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selec�ie mesaje:\n"
 
-#: src/msgattrib.c:407
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            p�streaz� pe cele traduse, �terge mesajele netraduse\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            p�streaz� pe cele traduse, �terge mesajele "
+"netraduse\n"
 
-#: src/msgattrib.c:409
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          p�streaz� pe cele netraduse, �terge mesajele traduse\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          p�streaz� pe cele netraduse, �terge mesajele "
+"traduse\n"
 
-#: src/msgattrib.c:411
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:413
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            p�streaz� mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:415
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �terge mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:417
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         p�streaz� mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:420
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:422
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteaz� toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:424
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteaz� toate mesajele �nvechite\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteaz� toate mesajele non-�nvechite\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "  -u, --unique                shorthand for --less-than=2, requests\n"
+#| "                              that only unique messages be printed\n"
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"  -u, --unique                   scurt�tur� pentru --less-than=2, solicit�\n"
+"                                 ca doar mesajele unice s� fie tip�rite\n"
+
+#: src/msgattrib.c:478
+#, fuzzy, c-format
+#| msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
+
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+#| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
+
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=FI�IER.po     manipuleaz� doar intr�rile listate �n FI�IER.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=FI�IER.po     manipuleaz� doar intr�rile listate �n FI�IER."
+"po\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=FI�IER.po   manipuleaz� doar intr�rile nelistate �n FI�IER.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=FI�IER.po   manipuleaz� doar intr�rile nelistate �n "
+"FI�IER.po\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              sinonim pentru --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              sinonim pentru --only-obsolete --clear-"
+"obsolete\n"
 
-#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
-#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
-#: src/msguniq.c:347
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintax� fi�ier de intrare(input:\n"
 
-#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input     fi�ierul de intrare(input) este �n sintax� Java .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input     fi�ierul de intrare(input) este �n sintax� "
+"Java .properties\n"
 
-#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     fi�ierul de intrare(input) este �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
+#, 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:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                folose�te escape-uri C �n output, f�r� caractere extinse\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                folose�te escape-uri C �n output, f�r� "
+"caractere extinse\n"
 
-#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                scrie fi�ierul .po folosind stil indentat\n"
+msgstr ""
+"  -i, --indent                scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          genereaz� liniile '#: filename:line' (implicit)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          genereaz� liniile '#: filename:"
+"line' (implicit)\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output     scrie un fi�ier .strings NeXTstep/GNUstep\n"
+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:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               nu trunchiaz�(break) liniile lungi de mesaje, mai mari\n"
-"                              dec�t l��imea paginii de output,�n c�teva linii\n"
+"      --no-wrap               nu trunchiaz�(break) liniile lungi de mesaje, "
+"mai mari\n"
+"                              dec�t l��imea paginii de output,�n c�teva "
+"linii\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereaz� output sortat\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          sorteaz� output-ul dup� loca�ia fi�ierului\n"
 
-#: src/msgcat.c:288 src/msgcomm.c:305
+#: 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:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]...\n"
 
-#: src/msgcat.c:336
-#, c-format, no-wrap
+#: src/msgcat.c:371
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Concatenates and merges the specified PO files.\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be cumulated, except that if --use-first\n"
+#| "is specified, they will be taken from the first PO file to define them.\n"
+#| "File positions from all PO files will be cumulated.\n"
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -869,9 +1599,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "Concateneaz� �i �mbin�(merge) fi�ierele PO specificate.\n"
 "G�se�te mesajele care sunt comune a dou� sau mai multe fi�iere PO specificate.\n"
@@ -884,42 +1614,47 @@ 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:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FI�IER_INTRARE ...                  fi�iere de intrare(input)\n"
 
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=FI�IER          ob�ine lista de fi�iere de intrare din "
+"FI�IER\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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"
+msgstr ""
+"Dac� fi�ierul de intrare este -, se va citi intrarea(input) standard.\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:377
+#: 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 ""
 "  -<, --less-than=NUM�R         tip�re�te mesajele cu mai pu�in de at�tea\n"
-"                                 defini�ii, dac� nu este setat, implicit este\n"
+"                                 defini�ii, dac� nu este setat, implicit "
+"este\n"
 "                                 infinit\n"
 
-#: src/msgcat.c:375
+#: 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 ""
 "  ->, --more-than=NUM�R         tip�re�te mesajele cu mai mult de at�tea\n"
-"                                 defini�ii, dac� nu este setat implicit este 0\n"
+"                                 defini�ii, dac� nu este setat implicit este "
+"0\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:383
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -928,14 +1663,17 @@ msgstr ""
 "  -u, --unique                   scurt�tur� pentru --less-than=2, solicit�\n"
 "                                 ca doar mesajele unice s� fie tip�rite\n"
 
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input     fi�ierele de intrare(input) sunt �n sintax� .properties Java\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input     fi�ierele de intrare(input) sunt �n sintax� ."
+"properties Java\n"
 
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -944,36 +1682,50 @@ msgstr ""
 "      --stringtable-input     fi�ierele de intrare(input) sunt �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:392 src/msgconv.c:314 src/msguniq.c:356
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr " -t, --to-code=NUME             codarea(encoding) pentru ie�ire(output)\n"
+msgstr ""
+" -t, --to-code=NUME             codarea(encoding) pentru ie�ire(output)\n"
 
-#: src/msgcat.c:394 src/msguniq.c:358
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first                folose�te prima traducere disponibil� pentru\n"
-"                                 fiecare mesaj, nu �mbin� mai multe traduceri\n"
+"      --use-first                folose�te prima traducere disponibil� "
+"pentru\n"
+"                                 fiecare mesaj, nu �mbin� mai multe "
+"traduceri\n"
 
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --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:177 src/msgcomm.c:290 src/msgmerge.c:378
+msgid "Peter Miller"
+msgstr ""
+
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "nu au fost date fi�iere de intrare(input)"
 
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sunt necesare exact 2 fi�iere de intrare(input)"
 
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Folosire: %s [OP�IUNE] def.po ref.pot\n"
 
-#: src/msgcmp.c:185
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -991,67 +1743,114 @@ 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:199
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduceri\n"
 
-#: src/msgcmp.c:201
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referin�e la surse\n"
 
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori de opera�ie:\n"
 
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:240 src/msgmerge.c:608
+#, c-format
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          aplic� ref.pot pe fiecare domeniu din def.po\n"
+
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, 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:244
+#, fuzzy, c-format
+#| msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
+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:246
+#, fuzzy, c-format
+#| msgid ""
+#| "      --untranslated          keep untranslated, remove translated "
+#| "messages\n"
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr ""
+"      --untranslated          p�streaz� pe cele netraduse, �terge mesajele "
+"traduse\n"
+
+#: src/msgcmp.c:324
+#, fuzzy, c-format
+#| msgid "warning: this message is not used"
+msgid "this message is untranslated"
+msgstr "avertisment: acest mesaj nu este folosit"
+
+#: src/msgcmp.c:330
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          aplic� ref.pot pe fiecare domeniu din def.po\n"
+msgid "this message needs to be reviewed by the translator"
+msgstr ""
 
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "acest mesaj este folosit dar nu este definit..."
 
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...dar defini�ia este similar�"
 
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:396
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:403
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:294
+#: 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:342
-#, c-format, no-wrap
+#: 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"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "cumulated.\n"
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1064,76 +1863,91 @@ 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:380
+#: 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 ""
 "  ->, --more-than=NUM�R         tip�re�te mesajele cu mai mult de at�tea\n"
-"                                 defini�ii, dac� nu este setat implicit este 1\n"
+"                                 defini�ii, dac� nu este setat implicit este "
+"1\n"
 
-#: src/msgcomm.c:424 src/xgettext.c:837
-#, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
-msgstr "      --omit-header              nu include �n header intrarea `msgid \"\"'\n"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, fuzzy, c-format
+#| msgid ""
+#| "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header              nu include �n header intrarea `msgid \"\"'\n"
 
-#: src/msgconv.c:288
+#: src/msgconv.c:311
 #, 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"
+msgstr ""
+"Face conversia unui catalog de traduceri �ntr-o alt� codare(encoding) de "
+"caractere.\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "�int� conversie:\n"
 
-#: src/msgconv.c:316
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Codarea(encoding) implicit� este codarea(encoding) localiz�rii curente.\n"
+msgstr ""
+"Codarea(encoding) implicit� este codarea(encoding) localiz�rii curente.\n"
 
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, 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:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location              nu scrie linii '#: filename:line'\n"
 
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
-#, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "      --add-location             genereaz� linii '#: filename:line' (implicit)\n"
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, fuzzy, c-format
+#| msgid ""
+#| "      --add-location          preserve '#: filename:line' lines "
+#| "(default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location             genereaz� linii '#: filename:"
+"line' (implicit)\n"
 
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                   scrie strict fi�iere conforme Uniforum\n"
+msgstr ""
+"      --strict                   scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fi�ier de intrare"
 
-#: src/msgen.c:224
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "este solicitat exact un singur fi�ier de intrare"
 
-#: src/msgen.c:262
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Folosire: %s [OP�IUNE] FI�IER_INTRARE\n"
 
-#: src/msgen.c:267
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1146,22 +1960,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:279
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  FI�IER_INTRARE ...                  fi�iere de intrare(input) PO sau POT\n"
+msgstr ""
+"  FI�IER_INTRARE ...                  fi�iere de intrare(input) PO sau POT\n"
 
-#: src/msgexec.c:192
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "lipse�te numele comenzii"
 
-#: src/msgexec.c:238
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE] COMAND� [OP�IUNE-COMAND�]\n"
 
-#: src/msgexec.c:243
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1176,7 +1991,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:252
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1186,42 +2001,50 @@ msgstr ""
 "un octet null.  Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
 "pentru \"xargs - 0\".\n"
 
-#: src/msgexec.c:262 src/msgfilter.c:384
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "intrare(input) standard"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=FI�IER_INTRARE ...           fi�ier de intrare(input) PO\n"
+msgstr ""
+"  -i, --input=FI�IER_INTRARE ...           fi�ier de intrare(input) PO\n"
 
-#: src/msgexec.c:322
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "scriere la stdout e�uat�"
 
-#: src/msgexec.c:345 src/msgfilter.c:637
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "scrierea �n subprocesul %s e�uat�"
-
-#: src/msgfilter.c:285
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "lipse�te numele de filtru"
 
-#: src/msgfilter.c:309
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cel pu�in un script sed trebuie specificat"
 
-#: src/msgfilter.c:371
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE] FILTRU [OP�IUNE-FILTRU]\n"
 
-#: src/msgfilter.c:375
+#: src/msgfilter.c:417
 #, 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:399
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1230,502 +2053,603 @@ 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:404
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, 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:406
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SCRIPT     adaug� SCRIPTul la comenzile ce vor fi executate\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=SCRIPT     adaug� SCRIPTul la comenzile ce vor fi "
+"executate\n"
 
-#: src/msgfilter.c:408
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=FI�IERSCRIPT       adaug� con�inutul FI�IERSCRIPT la comenzile\n"
 "                                ce vor fi executate\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       suprim� tip�rirea automat� a spa�iului model(pattern)\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       suprim� tip�rirea automat� a spa�iului "
+"model(pattern)\n"
 
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "     --no-escape                nu folose�te escape-uri C �n output (implicit)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"     --no-escape                nu folose�te escape-uri C �n output "
+"(implicit)\n"
 
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                   scrie fi�ierul .po folosind stil indentat\n"
-
-#: src/msgfilter.c:431
-#, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           p�streaz� headerul nemodificat, nu �l filtreaz�\n"
+msgstr ""
+"      --indent                   scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgfilter.c:560
+#: src/msgfilter.c:485
 #, c-format
-msgid "Not yet implemented."
-msgstr "Neimplimentat �nc�."
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           p�streaz� headerul nemodificat, nu �l "
+"filtreaz�\n"
 
-#: src/msgfilter.c:589
-#, 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:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "fi�ierul \"%s\" con�ine un �ir terminat non NUL"
 
-#: src/msgfilter.c:617
+#: src/msgfmt.c:372
 #, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunica�ia cu subprocesul %s a e�uat"
+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/msgfilter.c:668
+#: src/msgfmt.c:419
 #, c-format
-msgid "read from %s subprocess failed"
-msgstr "citirea din subprocesul %s a e�uat"
+msgid "invalid endianness: %s"
+msgstr ""
 
-#: src/msgfilter.c:684
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "subprocesul %s s-a terminat cu cod de ie�ire %d"
+#. This is a proper name. See the gettext manual, section Names.
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
+msgid "Ulrich Drepper"
+msgstr ""
 
-#: src/msgfmt.c:299
-#, 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:471
+#, fuzzy, c-format
+#| msgid "If no input file is given or if it is -, standard input is read.\n"
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Dac� nu este dat nici un fi�ier de intrare sau este -, se va citi "
+"intrarea(input) standard.\n"
 
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:393 src/msgunfmt.c:258
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s e valid doar cu %s"
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s necesit� specificarea \"-l localizare\""
 
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s necesit� specificarea \"-l localizare\""
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s �i %s se exclud reciproc"
+
+#: src/msgfmt.c:626 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:503
+#: src/msgfmt.c:632 src/msgfmt.c:638
+#, fuzzy, c-format
+#| msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s e valid doar cu %s sau cu %s"
+
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:508
+#: src/msgfmt.c:881
 #, 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:513
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:533
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OP�IUNE] numefi�ier.po ...\n"
 
-#: src/msgfmt.c:537
+#: src/msgfmt.c:910
 #, 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:542 src/xgettext.c:717
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
 msgstr ""
-"Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru op�iunile\n"
-"scurte. Similar pentru argumentele op�ionale.\n"
+"Genereaz� un catalog binar de mesaje din descriere de traducere textual�\n"
 
-#: src/msgfmt.c:549
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefi�ier.po ...             fi�iere de intrare(input)\n"
 
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:558
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Mod Java: genereaz� o clas� Java "
+"ResourceBundle\n"
+
+#: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Mod Java: genereaz� o clas� Java ResourceBundle\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 precum --java, �i presupune Java2 (JDK 1.2 sau "
+"ulterior)\n"
 
-#: src/msgfmt.c:560
+#: src/msgfmt.c:935
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
+
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 precum --java, �i presupune Java2 (JDK 1.2 sau ulterior)\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
 
-#: src/msgfmt.c:562
+#: src/msgfmt.c:939
 #, 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"
+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:564
+#: src/msgfmt.c:941
 #, 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:571
+#: src/msgfmt.c:943
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
+
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeaz� modul strict Uniforum\n"
 
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
+msgstr ""
+"Dac� fi�ierul de ie�ire(output) este -, output-ul este scris la ie�irea "
+"standard.\n"
 
-#: src/msgfmt.c:576
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Java:\n"
 
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOCALIZARE         nume localizare, fie limb�, fie                                                 limb�_�AR�\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALIZARE         nume localizare, fie limb�, "
+"fie                                                 limb�_�AR�\n"
 
-#: src/msgfmt.c:582
+#: src/msgfmt.c:963
+#, fuzzy, c-format
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
+"msgcat .msg\n"
+
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d DIRECTOR                 directorul de baz� al ierarhiei directoarelor\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d DIRECTOR                 directorul de baz� al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:584
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Numele clasei este determinat ad�ug�nd numele localiz�rii la numele resursei\n"
+"Numele clasei este determinat ad�ug�nd numele localiz�rii la numele "
+"resursei\n"
 "separat� de liniu��_jos.  Op�iunea -d este obligatorie.  Clasa este\n"
 "scris� �n directorul specificat.\n"
 
-#: src/msgfmt.c:590
+#: src/msgfmt.c:973
+#, fuzzy, c-format
+#| msgid "Output file location in Tcl mode:\n"
+msgid "Output file location in C# mode:\n"
+msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
+
+#: src/msgfmt.c:979 src/msgunfmt.c:473
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of classes directory "
+#| "hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DIRECTOR                 directorul de baz� al ierarhiei directoarelor\n"
+
+#: src/msgfmt.c:981
+#, fuzzy, c-format
+#| msgid ""
+#| "The -l and -d options are mandatory.  The .msg file is written in the\n"
+#| "specified directory.\n"
+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 ""
+"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este scris �n "
+"directorul\n"
+"specificat\n"
+
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
 
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d DIRECTOR                 directorul de baz� al cataloagelor de mesaje ."
+"msg\n"
 
-#: src/msgfmt.c:596
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este scris �n directorul\n"
+"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este scris �n "
+"directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:995
 #, c-format
-msgid "Input file interpretation:\n"
-msgstr "Interpretare fi�ier de intrarea(input):\n"
-
-#: src/msgfmt.c:610
-#, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+msgid "Desktop Entry mode options:\n"
 msgstr ""
-"  -c, --check                 execut� toate verific�rile sugerate\n"
-"                                --check-format, --check-header, --check-domain\n"
 
-#: src/msgfmt.c:613
+#: src/msgfmt.c:1001
 #, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          verific� �irurile format dependent de limbaj\n"
-
-#: src/msgfmt.c:615
-#, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          verific� prezen�a �i con�inutul header-ului\n"
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
 
-#: src/msgfmt.c:617
-#, c-format
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr ""
+"  -d DIRECTOR                 directorul de baz� al cataloagelor de mesaje ."
+"msg\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, fuzzy, c-format
+#| msgid ""
+#| "  -k, --keyword[=WORD]        additional keyword to be looked for "
+#| "(without\n"
+#| "                              WORD means not to use default keywords)\n"
 msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"      --check-domain          verific� eventualele conflicte dintre directivele\n"
-"                                de domenii �i op�iunea --output-file\n"
-
-#: src/msgfmt.c:620
-#, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   verific� dac� GNU msgfmt se comport� ca X/Open msgfmt\n"
+"  -k, --keyword[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
+"                                  CUV�NT �nseamn� neutilizarea "
+"cuvintelor_cheie\n"
+"                                  implicite)\n"
 
-#: src/msgfmt.c:622
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
-"                                menu items\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"      --check-accelerators[=CAR]  verific� prezen�a acceleratorilor de tastatur�\n"
-"                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:625
+#: src/msgfmt.c:1012
 #, 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:630
-#, 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"
-
-#: src/msgfmt.c:632
-#, 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:641
-#, c-format
-msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            afi�eaz� statistici despre traduceri\n"
-
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
-#, c-format
-msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               m�re�te nivelul de detaliere\n"
-
-#: src/msgfmt.c:781
-#, c-format
-msgid "plural expression can produce negative values"
-msgstr "expresiile plurale pot produce valori negative"
-
-#: src/msgfmt.c:794
-#, 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/msgfmt.c:821
-#, c-format
-msgid "plural expression can produce division by zero"
-msgstr "expresia plural� poate produce �mp�r�ire la zero"
-
-#: src/msgfmt.c:827
-#, c-format
-msgid "plural expression can produce integer overflow"
-msgstr "plural expression can produce dep�ire(overflow) de �ntreg(integer)"
-
-#: src/msgfmt.c:833
-#, c-format
-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/msgfmt.c:911 src/msgfmt.c:923
-#, c-format
-msgid "message catalog has plural form translations..."
-msgstr "catalogul de mesaje are traduceri �n forme plurale..."
-
-#: src/msgfmt.c:914
-#, c-format
-msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...dar header-ului �i lipse�te atributul \"plural=EXPRESSION\""
-
-#: src/msgfmt.c:926
-#, c-format
-msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...dar header-ului �i lipse�te atributul \"plural=INTEGER\""
+msgid "XML mode options:\n"
+msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1016
 #, c-format
-msgid "invalid nplurals value"
-msgstr "valoare nplurals invalid�"
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1020
 #, c-format
-msgid "invalid plural expression"
-msgstr "expresie plural� invalid�"
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
 
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
-msgid "nplurals = %lu..."
-msgstr "nplurals = %lu..."
+msgid "Input file interpretation:\n"
+msgstr "Interpretare fi�ier de intrarea(input):\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1038
 #, 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"
+msgid ""
+"  -c, --check                 perform all the checks implied by\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
+msgstr ""
+"  -c, --check                 execut� toate verific�rile sugerate\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1041
 #, 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"
+msgid "      --check-format          check language dependent format strings\n"
+msgstr ""
+"      --check-format          verific� �irurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1043
 #, c-format
-msgid "Try using the following, valid for %s:\n"
-msgstr "�ncerca�i s� folosi�i urm�toarele, valide pentru %s:\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          verific� prezen�a �i con�inutul header-ului\n"
 
 #: src/msgfmt.c:1045
 #, c-format
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "catalogul de mesaje are traduceri de form� plural�, dar �i lipse�te un header cu\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-
-#: src/msgfmt.c:1079
-#, c-format
-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/msgfmt.c:1089
-#, 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/msgfmt.c:1101
-#, c-format
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "intr�rile `msgid' �i `msgstr' nu �ncep am�ndou� cu '\\n'"
-
-#: src/msgfmt.c:1118
-#, c-format
-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/msgfmt.c:1128
-#, 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'"
+msgid ""
+"      --check-domain          check for conflicts between domain directives\n"
+"                                and the --output-file option\n"
+msgstr ""
+"      --check-domain          verific� eventualele conflicte dintre "
+"directivele\n"
+"                                de domenii �i op�iunea --output-file\n"
 
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1048
 #, c-format
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "intr�rile `msgid' �i `msgstr' nu se termin� am�ndou� cu '\\n'"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   verific� dac� GNU msgfmt se comport� ca X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1050
 #, c-format
-msgid "plural handling is a GNU gettext extension"
-msgstr "manipularea de plurale este o extensie a GNU gettext"
+msgid ""
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
+"                                menu items\n"
+msgstr ""
+"      --check-accelerators[=CAR]  verific� prezen�a acceleratorilor de "
+"tastatur�\n"
+"                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1053
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
-msgstr "'%s' nu este un format valid de �ir %s, spre deosebire de 'msgid'. Motiv: %s"
+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:1261
+#: src/msgfmt.c:1058
 #, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
+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"
 
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1060
 #, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr are prea multe marcaje de acceleratoare tastatur� '%c'"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
 
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1063
 #, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "c�mpul header '%s' lipse�te din header\n"
+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:1307
+#: src/msgfmt.c:1072
 #, 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/msgfmt.c:1318
-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"
+msgid "      --statistics            print statistics about translations\n"
+msgstr "      --statistics            afi�eaz� statistici despre traduceri\n"
 
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
+msgid "  -v, --verbose               increase verbosity level\n"
+msgstr "  -v, --verbose               m�re�te nivelul de detaliere\n"
 
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1185
 #, 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:1391
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va func�iona\n"
 
-#: src/msgfmt.c:1401
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "avertisment: headerul fi�ierului PO este neclar(fuzzy)\n"
-
-#: src/msgfmt.c:1403
-#, 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:1426
+#: src/msgfmt.c:1211
 #, 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:1431
+#: src/msgfmt.c:1216
 #, 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"
+msgstr ""
+"numele de domeniu \"%s\" nu este potrivit ca nume de fi�ier: se va utiliza "
+"prefix"
 
-#: src/msgfmt.c:1445
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorat�"
 
-#: src/msgfmt.c:1499
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "intrarea `msgstr' vid� ignorat�"
 
-#: src/msgfmt.c:1500
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclar�(fuzzy) ignorat�"
 
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fi�ierul surs� con�ine traduceri aproximative(fuzzy)"
 
-#: src/msggrep.c:421
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
-msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
-msgstr "op�iunea '%c' nu poate fi folosit� �nainte ca 'K' sau 'T' s� fie specificate"
+msgid "error while reading \"%s\""
+msgstr "eroare �n timpul citirii \"%s\""
 
-#: src/msggrep.c:441
+#: src/msggrep.c:501
+#, fuzzy, c-format
+#| msgid ""
+#| "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"op�iunea '%c' nu poate fi folosit� �nainte ca 'K' sau 'T' s� fie specificate"
+
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1734,36 +2658,72 @@ 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:467
-#, c-format, no-wrap
+#: src/msggrep.c:547
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Message selection:\n"
+#| "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
+#| "  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
+#| "A message is selected if it comes from one of the specified source files,\n"
+#| "or if it comes from one of the specified domains,\n"
+#| "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
+#| "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
+#| "or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
+#| "\n"
+#| "When more than one selection criterion is specified, the set of selected\n"
+#| "messages is the union of the selected messages of each criterion.\n"
+#| "\n"
+#| "MSGID-PATTERN or MSGSTR-PATTERN syntax:\n"
+#| "  [-E | -F] [-e PATTERN | -f FILE]...\n"
+#| "PATTERNs are basic regular expressions by default, or extended regular\n"
+#| "expressions if -E is given, or fixed strings if -F is given.\n"
+#| "\n"
+#| "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
+#| "  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+#| "  -K, --msgid                 start of patterns for the msgid\n"
+#| "  -T, --msgstr                start of patterns for the msgstr\n"
+#| "  -C, --comment               start of patterns for the translator's comment\n"
+#| "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
+#| "  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
+#| "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
+#| "  -f, --file=FILE             obtain PATTERN from FILE\n"
+#| "  -i, --ignore-case           ignore case distinctions\n"
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
-"  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
+"  [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n"
+"  [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n"
 "A message is selected if it comes from one of the specified source files,\n"
 "or if it comes from one of the specified domains,\n"
+"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n"
 "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n"
 "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n"
-"or if -C is given and the translator's comment matches COMMENT-PATTERN.\n"
+"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n"
+"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n"
 "\n"
 "When more than one selection criterion is specified, the set of selected\n"
 "messages is the union of the selected messages of each criterion.\n"
 "\n"
-"MSGID-PATTERN or MSGSTR-PATTERN syntax:\n"
+"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
+"EXTRACTED-COMMENT-PATTERN syntax:\n"
 "  [-E | -F] [-e PATTERN | -f FILE]...\n"
 "PATTERNs are basic regular expressions by default, or extended regular\n"
 "expressions if -E is given, or fixed strings if -F is given.\n"
 "\n"
 "  -N, --location=SOURCEFILE   select messages extracted from SOURCEFILE\n"
 "  -M, --domain=DOMAINNAME     select messages belonging to domain DOMAINNAME\n"
+"  -J, --msgctxt               start of patterns for the msgctxt\n"
 "  -K, --msgid                 start of patterns for the msgid\n"
 "  -T, --msgstr                start of patterns for the msgstr\n"
 "  -C, --comment               start of patterns for the translator's comment\n"
+"  -X, --extracted-comment     start of patterns for the extracted comment\n"
 "  -E, --extended-regexp       PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings         PATTERN is a set of newline-separated strings\n"
 "  -e, --regexp=PATTERN        use PATTERN as a regular expression\n"
 "  -f, --file=FILE             obtain PATTERN from FILE\n"
 "  -i, --ignore-case           ignore case distinctions\n"
+"  -v, --invert-match          output only the messages that do not match any\n"
+"                              selection criterion\n"
 msgstr ""
 "elec�ie mesaje:\n"
 "  [-N FI�IERSURS�]... [-M NUMEDOMENIU]...\n"
@@ -1792,39 +2752,42 @@ msgstr ""
 "  -f, --file=FI�IER             ob�ine TIPAR din FI�IER\n"
 "  -i, --ignore-case           ignor� distinc�ia de caz\n"
 
-#: src/msggrep.c:508
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                   folose�te escape-uri C �n output, nu \n"
 "caractere extinse\n"
 
-#: src/msggrep.c:529
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "       --sort-output           genereaz� output sortat\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:625
 #, 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/msggrep.c:602
-#, c-format
-msgid "write to grep subprocess failed"
-msgstr "scrierea �n subprocesul grep a e�uat"
-
-#: src/msginit.c:293
+msgstr ""
+"       --sort-by-file          sorteaz� output-ul dup� loca�ia fi�ierului\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "V� afla�i �ntr-un mediu care nu �ine cont de limb�.  Seta�i\n"
 "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:321
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1835,12 +2798,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:345
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "S-a creat %s.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -1849,47 +2812,55 @@ msgstr ""
 "Creaz� un nou fi�er PO, ini�ializ�nd informa�iile meta cu valori pentru\n"
 "mediul utilizatorului.\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:381
 #, 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:377
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Dac� nu se precizeaz� fi�ierul de intrare, se va c�uta �n directorul curent dup�\n"
+"Dac� nu se precizeaz� fi�ierul de intrare, se va c�uta �n directorul curent "
+"dup�\n"
 "fi�ierul POT.\n"
 "Dac� acesta este -, se va citi intrarea(input) standard.\n"
 
-#: src/msginit.c:383
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=FI�IER      scrie output-ul spre fi�ierul PO specificat\n"
 
-#: src/msginit.c:385
+#: src/msginit.c:391
 #, 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 ""
-"Dac� nu este specificat nici un fi�ier de output, va depinde de op�iunea --locale\n"
+"Dac� nu este specificat nici un fi�ier de output, va depinde de op�iunea --"
+"locale\n"
 "sau de set�rile de localizare ale utilizatorului.\n"
 "Dac� este -, rezultatele vor fi scrise la ie�irea(output) standard.\n"
 
-#: src/msginit.c:398
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          seteaz� localizarea �int�\n"
 
-#: src/msginit.c:400
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         se presupune c� fi�ierul PO este generat automat\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         se presupune c� fi�ierul PO este generat "
+"automat\n"
 
-#: src/msginit.c:456
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1897,12 +2868,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:464 src/msginit.c:469
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "eroare �n citirea directorului curent"
 
-#: src/msginit.c:477
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1910,95 +2881,120 @@ 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:937 src/msginit.c:1004 src/msginit.c:1162 src/msginit.c:1244
-#: src/read-java.c:71 src/read-tcl.c:108
-#, c-format
-msgid "fdopen() failed"
-msgstr "fdopen() e�uat"
-
-#: src/msginit.c:945 src/msginit.c:1012 src/msginit.c:1170
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr "eroare I/O a subprocesului %s"
-
-#: src/msginit.c:957 src/msginit.c:1024 src/msginit.c:1182 src/msginit.c:1261
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, 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:1148
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Catalogul nou de mesaje ar trebui s� con�in� adresa voastr� de e-mail, astfel �nc�t\n"
-"utilizatorii s� poat� da un feedback despre traduceri, �i ca �ntre�in�torii(maintainers)\n"
+"Catalogul nou de mesaje ar trebui s� con�in� adresa voastr� de e-mail, "
+"astfel �nc�t\n"
+"utilizatorii s� poat� da un feedback despre traduceri, �i ca "
+"�ntre�in�torii(maintainers)\n"
 "s� v� poat� contacta �n caz de probleme tehnice nea�teptate.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducerea �n limba rom�n� pentru pachetul %s"
 
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:178 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"
+msgstr ""
+"setul de caractere prezent \"%s\" nu este un nume de codare(encoding) "
+"portabil"
 
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:199
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
-msgstr "fi�ierul de intrare(input) `%s' nu con�ine un header cu specifica�ie de set de caractere"
+msgstr ""
+"dou� seturi diferite de caractere \"%s\" �i \"%s\" �n fi�ierul de "
+"intrare(input)"
 
 #: src/msgl-cat.c:203
-#, c-format
-msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
-msgstr "domeniu \"%s\" din fi�ierul de intrare `%s' nu con�ine un header cu o specifica�ie de set de caractere"
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr ""
+"fi�ierul de intrare(input) `%s' nu con�ine un header cu specifica�ie de set "
+"de caractere"
+
+#: 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"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+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:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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."
+msgstr ""
+"setul de caractere �int� \"%s\" nu este un nume de codare(encoding) portabil."
 
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
 
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Fi�ierele de intrare con�in mesaje �n diverse cod�ri(encodings), UTF-8 printre altele.\n"
+"Fi�ierele de intrare con�in mesaje �n diverse cod�ri(encodings), UTF-8 "
+"printre altele.\n"
 "Se converte�te ie�irea(output) �n UTF-8.\n"
 
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Fi�ierele de intrare con�in mesaje �n diverse cod�ri(encodings), %s �i %s printre altele.\n"
+"Fi�ierele de intrare con�in mesaje �n diverse cod�ri(encodings), %s �i %s "
+"printre altele.\n"
 "Se converte�te ie�irea(output) �n UTF-8.\n"
-"Pentru a selecta o alt� codare(encoding) pentru ie�ire(output), folosi�i op�iunea\n"
+"Pentru a selecta o alt� codare(encoding) pentru ie�ire(output), folosi�i "
+"op�iunea\n"
 "--to-code.\n"
 
-#: src/msgl-charset.c:91
+#: src/msgl-cat.c:489
+#, c-format
+msgid ""
+"Conversion of file %s from %s encoding to %s encoding\n"
+"changes some msgids or msgctxts.\n"
+"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
+"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
+msgstr ""
+
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2011,12 +3007,12 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "Rezolv�ri(workadrounds) posibile sunt:\n"
 
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:99
 #, 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:103
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2027,7 +3023,7 @@ msgstr ""
 "  dup� care se aplic� '%s',\n"
 "  �i apoi reconvertire �n %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2040,47 +3036,246 @@ msgstr ""
 "  apoi aplicarea '%s',\n"
 "  dup� care se reconverte�te �n %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"Setul de caractere al localiz�rii \"%s\" nu este un nume portabil de codare(encoding).\n"
+"Setul de caractere al localiz�rii \"%s\" nu este un nume portabil de "
+"codare(encoding).\n"
 "Output-ul lui '%s' poate fi incorect.\n"
 "O posibil� solu�ie(workaround) este setarea LC_ALL=C.\n"
 
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-check.c:134
+msgid "plural expression can produce negative values"
+msgstr "expresiile plurale pot produce valori negative"
+
+#: src/msgl-check.c:145
+#, 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:191
+msgid "plural expression can produce division by zero"
+msgstr "expresia plural� poate produce �mp�r�ire la zero"
+
+#: src/msgl-check.c:196
+msgid "plural expression can produce integer overflow"
+msgstr "plural expression can produce dep�ire(overflow) de �ntreg(integer)"
+
+#: src/msgl-check.c:201
+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:270
+#, fuzzy, c-format
+#| msgid "Try using the following, valid for %s:\n"
+msgid "Try using the following, valid for %s:"
+msgstr "�ncerca�i s� folosi�i urm�toarele, valide pentru %s:\n"
+
+#: src/msgl-check.c:362 src/msgl-check.c:386
+#, fuzzy
+#| msgid "message catalog has plural form translations..."
+msgid "message catalog has plural form translations"
+msgstr "catalogul de mesaje are traduceri �n forme plurale..."
+
+#: src/msgl-check.c:364
+#, fuzzy
+#| msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgstr "...dar header-ului �i lipse�te atributul \"plural=EXPRESSION\""
+
+#: src/msgl-check.c:388
+#, fuzzy
+#| msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgstr "...dar header-ului �i lipse�te atributul \"plural=INTEGER\""
+
+#: src/msgl-check.c:424
+msgid "invalid nplurals value"
+msgstr "valoare nplurals invalid�"
+
+#: src/msgl-check.c:446
+msgid "invalid plural expression"
+msgstr "expresie plural� invalid�"
+
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, fuzzy, c-format
+#| msgid "nplurals = %lu..."
+msgid "nplurals = %lu"
+msgstr "nplurals = %lu..."
+
+#: src/msgl-check.c:478
+#, fuzzy, c-format
+#| msgid "...but some messages have only one plural form"
+#| msgid_plural "...but some messages have only %lu plural forms"
+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:494
+#, fuzzy, c-format
+#| msgid "...but some messages have one plural form"
+#| msgid_plural "...but some messages have %lu plural forms"
+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:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+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:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+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:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+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:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+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:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+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:692
+msgid "plural handling is a GNU gettext extension"
+msgstr "manipularea de plurale este o extensie a GNU gettext"
+
+#: src/msgl-check.c:733
 #, c-format
-msgid "conversion failure"
-msgstr "eroare de conversie"
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
 
-#: src/msgl-iconv.c:337
+#: src/msgl-check.c:744
 #, 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:818
+#, fuzzy, c-format
+#| msgid "some header fields still have the initial default value\n"
+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-check.c:835
+#, fuzzy, c-format
+#| msgid "headerfield `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
+msgstr "c�mpul header '%s' lipse�te din header\n"
+
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
+#, c-format
+msgid "%s: input is not valid in \"%s\" encoding"
+msgstr ""
+
+#: src/msgl-iconv.c:69
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
+
+#: src/msgl-iconv.c:288
 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"
+msgstr ""
+"fi�ierul de intrare(input) nu con�ine un header cu specifica�ia unui set de "
+"caractere"
 
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Nu se poate converti din \"%s\" �n \"%s\". %s se bazeaz� pe inconv(), iar iconv() nu suport� aceast� conversie."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Nu se poate converti din \"%s\" �n \"%s\". %s se bazeaz� pe inconv(), iar "
+"iconv() nu suport� aceast� conversie."
 
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Conversia din \"%s\" �n \"%s\" introduce duplicate: anumite msgid-uri diferite devin egale."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Conversia din \"%s\" �n \"%s\" introduce duplicate: anumite msgid-uri "
+"diferite devin egale."
 
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Nu se poate converti din \"%s\" �n \"%s\". %s se bazeaz� pe iconv(). Aceast� versiune a fost construit�(built) f�r� inconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+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:426 src/msgmerge.c:432
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s e valid doar cu %s"
 
-#: src/msgmerge.c:391
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "tip de backup"
 
-#: src/msgmerge.c:426
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2104,180 +3299,258 @@ msgstr ""
 "exact�, se va folosi potrivirea aproximativ�(fuzzy) pentru a produce rezultate\n"
 "mai bune.\n"
 
-#: src/msgmerge.c:443
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      traducerile referitoare la surse vechi\n"
 
-#: src/msgmerge.c:445
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referin�e la surse noi\n"
 
-#: src/msgmerge.c:449
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FI�IER       bibliotec� adi�ional� de traduceri de mesaje,\n"
+"  -C, --compendium=FI�IER       bibliotec� adi�ional� de traduceri de "
+"mesaje,\n"
 "                              poate fi specificat� de mai multe ori\n"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  --U, --update                aducere la zi(update) al def.po,\n"
-"                              nu face nimic dac� def.po este deja adus la zi\n"
+"                              nu face nimic dac� def.po este deja adus la "
+"zi\n"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:586
 #, 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:469
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultatele vor fi scrise �n def.po:\n"
 
-#: src/msgmerge.c:471
+#: src/msgmerge.c:590
 #, 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:473
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIX         suprascrie sufixul obi�nuit de backup\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Metoda controlului versiunii poate fi selectat� prin op�iunea --backup sau prin\n"
+"Metoda controlului versiunii poate fi selectat� prin op�iunea --backup sau "
+"prin\n"
 "variabila de mediu VERSION_CONTROL. Iat� �i valorile:\n"
-"  none, off       niciodat� nu efectueaz� backup-uri (chiar dac� --backup este furnizat)\n"
+"  none, off       niciodat� nu efectueaz� backup-uri (chiar dac� --backup "
+"este furnizat)\n"
 "  numbered, t     creaz� backup-uri numerotate\n"
 "  existing, nil   numerotate dac� exist� backup-uri, simple �n caz contrar\n"
 "  simple, never   creaz� �ntotdeauna backup-uri simple\n"
 
-#: src/msgmerge.c:482
-#, c-format
+#: src/msgmerge.c:601
+#, fuzzy, c-format
+#| msgid ""
+#| "The backup suffix is `~', unless set with --suffix or the "
+#| "SIMPLE_BACKUP_SUFFIX\n"
+#| "environment variable.\n"
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Sufixul de backup este`~', �n cazul �n care nu este setat cu --suffix sau cu\n"
+"Sufixul de backup este`~', �n cazul �n care nu este setat cu --suffix sau "
+"cu\n"
 "variabila de mediu SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:491
-#, 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:610
+#, fuzzy, c-format
+#| msgid ""
+#| "      --foreign-user          omit FSF copyright in output for foreign "
+#| "user\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr ""
+"      --foreign-user          omite copyright FSF la ie�ire pentru user "
+"str�in(foreign)\n"
+
+#: src/msgmerge.c:615
+#, fuzzy, c-format
+#| msgid ""
+#| "      --translated            keep translated, remove untranslated "
+#| "messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --translated            p�streaz� pe cele traduse, �terge mesajele "
+"netraduse\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprim� indicatorii de progres\n"
 
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "acest mesaj ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "acest mesaj nu ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sCitite %ld vechi + %ld referin�e, unite %ld, aproxim�ri %ld, lips� %ld, �nvechite %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sCitite %ld vechi + %ld referin�e, unite %ld, aproxim�ri %ld, lips� %ld, "
+"�nvechite %ld.\n"
 
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " efectuat.\n"
 
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: 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:334
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER]...\n"
 
-#: src/msgunfmt.c:338
+#: 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:347
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java               mod Java: intrarea(input) este o clas� Java\n"
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:442
+#, fuzzy, c-format
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+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:444
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/msgcat .msg\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
 
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:446
+#, c-format
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
+"msgcat .msg\n"
+
+#: 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:359
+#: 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:365
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Numele clasei este determinat prin ad�ugarea numelui localiz�rii la numele\n"
-"resursei, separat de liniu��_jos(underscore).  Clasa e localizat� folosind CLASSPATH.\n"
+"resursei, separat de liniu��_jos(underscore).  Clasa e localizat� folosind "
+"CLASSPATH.\n"
+
+#: src/msgunfmt.c:467
+#, fuzzy, c-format
+#| msgid "Input file location in Tcl mode:\n"
+msgid "Input file location in C# mode:\n"
+msgstr "Loca�ie fi�iere intrare �n mod Tcl:\n"
+
+#: src/msgunfmt.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "The -l and -d options are mandatory.  The .msg file is located in the\n"
+#| "specified directory.\n"
+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 ""
+"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este localizat �n "
+"directorul\n"
+"specificat.\n"
 
-#: src/msgunfmt.c:370
+#: 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:376
+#: 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 ""
-"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este localizat �n directorul\n"
+"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este localizat �n "
+"directorul\n"
 "specificat.\n"
 
-#: src/msgunfmt.c:396
+#: 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:398
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                   scrie strict fi�iere conforme Uniforum\n"
+msgstr ""
+"      --strict                   scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msguniq.c:309
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2299,45 +3572,37 @@ 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:342
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 afi�eaz� doar duplicatele\n"
 
-#: src/msguniq.c:344
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr " -u, --unique                   afi�eaz� doar mesajele unice, omi��nd duplicatele\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+" -u, --unique                   afi�eaz� doar mesajele unice, omi��nd "
+"duplicatele\n"
 
-#: src/open-po.c:55
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertisment: "
-
-#: src/po-charset.c:225
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Setul de caractere \"%s\" nu este un nume de codare(encoding) portabil.\n"
-"Conversia mesajelor �n setul de caractere al utilizatorului s-ar putea s� nu\n"
+"Conversia mesajelor �n setul de caractere al utilizatorului s-ar putea s� "
+"nu\n"
 "func�ioneze.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:320
-msgid "Continuing anyway, expect parse errors."
-msgstr "Se continu� oricum, se a�teapt� analiza(parse) erorilor."
-
-#: src/po-charset.c:292
-msgid "Continuing anyway."
-msgstr "Se continu� oricum."
-
-#: src/po-charset.c:295
+#: src/po-charset.c:557
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2346,8 +3611,7 @@ msgstr ""
 "Setul de caractere \"%s\" nu este suportat. %s se bazeaz� pe iconv(),\n"
 "iar iconv() nu suport� \"%s\".\n"
 
-#: src/po-charset.c:304 src/po-charset.c:330
-#, c-format
+#: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2355,12 +3619,15 @@ msgstr ""
 "Instalarea GNU libiconv �i apoi reinstalarea GNU gettext\n"
 "va rezolva aceast� problem�.\n"
 
-#: src/po-charset.c:309 src/po-charset.c:334
-#, c-format
-msgid "%s\n"
-msgstr "%s\n"
+#: src/po-charset.c:578 src/po-charset.c:616
+msgid "Continuing anyway, expect parse errors."
+msgstr "Se continu� oricum, se a�teapt� analiza(parse) erorilor."
+
+#: src/po-charset.c:580
+msgid "Continuing anyway."
+msgstr "Se continu� oricum."
 
-#: src/po-charset.c:323
+#: src/po-charset.c:607
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2369,177 +3636,254 @@ msgstr ""
 "Setul de caractere \"%s\" nu este suportat. %s se bazeaz� pe iconv().\n"
 "Aceast� versiune a fost construit�(built) f�r� iconv().\n"
 
-#: src/po-charset.c:349
-#, c-format
+#: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Setul de caractere lipse�te din header.\n"
-"Conversia de mesaje �n setul de caractere al utilizatorului nu va func�iona.\n"
+"Conversia de mesaje �n setul de caractere al utilizatorului nu va "
+"func�iona.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "folosire inconsistent� a #~"
 
-#: src/po-gram-gen.y:198
-#, c-format
-msgid "missing `msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "lipse�te sec�iunea `msgstr[]'"
 
-#: src/po-gram-gen.y:206
-#, c-format
-msgid "missing `msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "lipse�te sec�iunea `msgid_plural[]'"
 
-#: src/po-gram-gen.y:213
-#, c-format
-msgid "missing `msgstr' section"
+#: src/po-gram-gen.y:258
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "lipse�te sec�iunea `msgstr'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primul plural are index nonzero"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma plural� are index gre�it"
 
-#: src/po-lex.h:92 src/po-lex.h:107 src/po-lex.h:127 src/po-lex.h:142
-#: src/po-lex.c:103 src/po-lex.c:132
+#: 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:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secven�� multibyte invalid�"
 
-#: src/po-lex.c:486
+#: 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:496
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secven�� multibyte incomplet� la sf�r�itul liniei"
 
-#: src/po-lex.c:504
-#, c-format
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "eroare iconv"
 
-#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "eroare �n timpul citirii \"%s\""
-
-#: src/po-lex.c:737
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "cuv�ntul cheie \"%s\" este necunoscut"
 
-#: src/po-lex.c:847
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "secven�� de control invalid�"
 
-#: src/po-lex.c:955
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "sf�r�it de fi�ier �n �ir"
 
-#: src/po-lex.c:961
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "sf�r�it de linie �n �ir"
 
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/po-lex.c:1006
+#, c-format
+msgid "context separator <EOT> within string"
+msgstr ""
+
+#: src/read-catalog.c:325 src/xgettext.c:1228
+#, 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:370
+msgid "duplicate message definition"
+msgstr "defini�ie duplicat� de mesaj"
+
+#: src/read-catalog.c:372
+#, fuzzy
+#| msgid "...this is the location of the first definition"
+msgid "this is the location of the first definition"
+msgstr "...aceasta este loca�ia primei defini�ii"
+
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "lipse�te numele de filtru"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "valoare nplurals invalid�"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "fi�ierul \"%s\" este trunchiat"
 
-#: src/read-mo.c:122
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fi�ierul \"%s\" con�ine un �ir terminat non NUL"
 
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "fi�ierul \"%s\" con�ine un �ir terminat non NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fi�ierul \"%s\" nu este �n formatul GNU .mo"
 
-#: src/read-mo.c:170
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fi�ierul \"%s\" con�ine un �ir terminat non NUL, la %s"
 
-#: src/read-po.c:318 src/xgettext.c:869
-#, c-format
-msgid "this file may not contain domain directives"
-msgstr "acest fi�ier poate s� nu con�in� directive de domeniu"
-
-#: src/read-po.c:357
-#, c-format
-msgid "duplicate message definition"
-msgstr "defini�ie duplicat� de mesaj"
+#: src/read-properties.c:357
+#, fuzzy
+#| msgid "%s:%lu: warning: invalid \\uxxxx syntax for Unicode character"
+msgid "warning: invalid \\uxxxx syntax for Unicode character"
+msgstr "%s:%lu: avertisment: sintax� invalid� \\uxxxx pentru caracter Unicode"
 
-#: src/read-po.c:358
+#: src/read-properties.c:429
 #, c-format
-msgid "...this is the location of the first definition"
-msgstr "...aceasta este loca�ia primei defini�ii"
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
 
-#: src/read-properties.c:215
-#, c-format
-msgid "%s:%lu: warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%lu: avertisment: sintax� invalid� \\uxxxx pentru caracter Unicode"
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: avertisment: caracter Unicode invalid"
 
-#: src/read-stringtable.c:804
-#, c-format
-msgid "%s:%lu: warning: unterminated string"
-msgstr "%s:%lu: avertisment: �ir neterminat"
+#: src/read-stringtable.c:802
+#, fuzzy
+#| msgid "%s:%d: warning: unterminated string"
+msgid "warning: unterminated string"
+msgstr "%s:%d: avertisment: �ir neterminat"
 
-#: src/read-stringtable.c:815
-#, c-format
-msgid "%s:%lu: warning: syntax error"
+#: src/read-stringtable.c:810
+#, fuzzy
+#| msgid "%s:%lu: warning: syntax error"
+msgid "warning: syntax error"
 msgstr "%s:%lu: avertisment: eroare de sintax�"
 
-#: src/read-stringtable.c:878 src/read-stringtable.c:900
-#, c-format
-msgid "%s:%lu: warning: unterminated key/value pair"
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
+#, fuzzy
+#| msgid "%s:%lu: warning: unterminated key/value pair"
+msgid "warning: unterminated key/value pair"
 msgstr "%s:%lu: avertisment: pereche cheie/valoare neterminat�"
 
-#: src/read-stringtable.c:946
-#, c-format
-msgid "%s:%lu: warning: syntax error, expected ';' after string"
+#: src/read-stringtable.c:940
+#, fuzzy
+#| msgid "%s:%lu: warning: syntax error, expected ';' after string"
+msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: avertisment: eroare de sintax�, se a�tepta ';' dup� �ir"
 
-#: src/read-stringtable.c:956
+#: src/read-stringtable.c:948
+#, fuzzy
+#| msgid "%s:%lu: warning: syntax error, expected '=' or ';' after string"
+msgid "warning: syntax error, expected '=' or ';' after string"
+msgstr ""
+"%s:%lu: avertisment: eroare de sintax�, se a�tepta '=' sau ';' dup� �ir"
+
+#: src/recode-sr-latin.c:115
+#, fuzzy, c-format
+#| msgid "Written by %s.\n"
+msgid "Written by %s and %s.\n"
+msgstr "Scris de %s.\n"
+
+#. TRANSLATORS: This is a proper name. The last name is
+#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
+#. "&Scaron;egan".
+#. This is a proper name. See the gettext manual, section Names.
+#: src/recode-sr-latin.c:119
+msgid "Danilo Segan"
+msgstr ""
+
+#: src/recode-sr-latin.c:152
+#, c-format, no-wrap
+msgid "Recode Serbian text from Cyrillic to Latin script.\n"
+msgstr ""
+
+#: src/recode-sr-latin.c:155
+#, c-format, no-wrap
+msgid ""
+"The input text is read from standard input.  The converted text is output to\n"
+"standard output.\n"
+msgstr ""
+
+#: src/recode-sr-latin.c:335
 #, c-format
-msgid "%s:%lu: warning: syntax error, expected '=' or ';' after string"
-msgstr "%s:%lu: avertisment: eroare de sintax�, se a�tepta '=' sau ';' dup� �ir"
+msgid "input is not valid in \"%s\" encoding"
+msgstr ""
+
+#: src/recode-sr-latin.c:363
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
+msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
 
-#: src/urlget.c:149
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "se a�teptau dou� argumente"
 
-#: src/urlget.c:166
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Folosire: %s [OP�IUNE] URL FI�IER\n"
 
-#: src/urlget.c:171
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2548,97 +3892,196 @@ 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:218
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "eroare �n citirea lui \"%s\""
+
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "eroare �n scrierea stdout"
 
-#: src/write-java.c:977
+#: src/urlget.c:237
 #, 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"
+msgid "error after reading \"%s\""
+msgstr "eroare dup� citirea lui \"%s\""
 
-#: src/write-java.c:987
+#: src/urlget.c:263
 #, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr "nu se poate crea un director temporar folosind modelul(template) \"%s\""
+msgid "Retrieving %s..."
+msgstr ""
 
-#: src/write-java.c:1000
+#: src/urlget.c:296
 #, c-format
-msgid "not a valid Java class name: %s"
-msgstr "nu este un nume valid de clas� Java: %s"
+msgid " timed out.\n"
+msgstr ""
 
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/urlget.c:433
 #, c-format
-msgid "failed to create \"%s\""
-msgstr "eroare �n crearea \"%s\""
+msgid " failed.\n"
+msgstr ""
 
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "eroare �n scrierea fi�ierului \"%s\""
+#: src/write-catalog.c:125
+#, fuzzy
+#| msgid ""
+#| "Cannot output multiple translation domains into a single file with Java ."
+#| "properties syntax. Try using PO file syntax instead."
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Nu se pot scrie mai multe domenii de traduceri �ntr-un singur fi�ier cu "
+"sintax� .properties Java. �ncerca�i sintaxa fi�ierului PO �n loc."
+
+#: src/write-catalog.c:128
+#, fuzzy
+#| msgid ""
+#| "Cannot output multiple translation domains into a single file with "
+#| "NeXTstep/GNUstep .strings syntax."
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Nu se pot scrie mai multe domenii de traduceri �ntr-un singur fi�ier cu "
+"sintax� .strings NeXTstep/GNUstep."
+
+#: src/write-catalog.c:161
+#, fuzzy
+#| msgid ""
+#| "message catalog has plural form translations, but the output format does "
+#| "not support them."
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
+"ie�ire(output) nu le suport�."
+
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
+"ie�ire(output) nu le suport�. �ncerca�i generarea unei clase Java folosing "
+"\"msgfmt --java\", �n locul unui fi�ier de propriet��i."
 
-#: src/write-java.c:1092
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+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:274 src/write-xml.c:59
 #, 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"
+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:282
+msgid "standard output"
+msgstr "ie�ire(output) standard"
+
+#: src/write-csharp.c:708
+#, fuzzy, c-format
+#| msgid "failed to create \"%s\""
+msgid "failed to create directory \"%s\""
+msgstr "eroare �n crearea \"%s\""
 
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-csharp.c:771
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+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:773
+#, fuzzy, c-format
+#| msgid "communication with %s subprocess failed"
+msgid "compilation of C# class failed"
+msgstr "comunica�ia cu subprocesul %s a e�uat"
+
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare �n deschiderea \"%s\" pentru scriere"
 
-#: src/write-po.c:605
+#: src/write-java.c:1096
 #, 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'"
+msgid "not a valid Java class name: %s"
+msgstr "nu este un nume valid de clas� Java: %s"
 
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-java.c:1216
 #, 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:1219
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"compilarea clasei Java a e�uat, v� rug�m �ncerca�i --verbose sau seta�i "
+"$JAVAC"
+
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "secven�� multibyte invalid�"
+
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
 msgid ""
-"The following msgid contains non-ASCII characters.\n"
+"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:1334 src/write-po.c:1502
+#, fuzzy, c-format
+#| msgid ""
+#| "The following msgid contains non-ASCII characters.\n"
+#| "This will cause problems to translators who use a character encoding\n"
+#| "different from yours. Consider using a pure ASCII msgid instead.\n"
+#| "%s\n"
+msgid ""
+"The following msgctxt contains non-ASCII characters.\n"
 "This will cause problems to translators who use a character encoding\n"
-"different from yours. Consider using a pure ASCII msgid instead.\n"
+"different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
 "Urm�torul msgid con�ine caractere non-ASCII.\n"
 "Aceasta va cauza probleme traduc�torilor care folosesc o codare(encoding)\n"
-"de caractere diferit� de a voastr�. Lua�i �n considerare folosirea unui msgid\n"
+"de caractere diferit� de a voastr�. Lua�i �n considerare folosirea unui "
+"msgid\n"
 "pur ASCII �n loc.\n"
 "%s\n"
 
-#: src/write-po.c:1057
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
-msgid "Cannot output multiple translation domains into a single file with Java .properties syntax. Try using PO file syntax instead."
-msgstr "Nu se pot scrie mai multe domenii de traduceri �ntr-un singur fi�ier cu sintax� .properties Java. �ncerca�i sintaxa fi�ierului PO �n loc."
-
-#: src/write-po.c:1059
-#, c-format
-msgid "Cannot output multiple translation domains into a single file with NeXTstep/GNUstep .strings syntax."
-msgstr "Nu se pot scrie mai multe domenii de traduceri �ntr-un singur fi�ier cu sintax� .strings NeXTstep/GNUstep."
-
-#: src/write-po.c:1085
-#, c-format
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "catalogul de mesaje are traduceri �n form� plural�, dar formatul de ie�ire(output) nu le suport�. �ncerca�i generarea unei clase Java folosing \"msgfmt --java\", �n locul unui fi�ier de propriet��i."
-
-#: src/write-po.c:1089
-#, c-format
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "catalogul de mesaje are traduceri �n form� plural�, dar formatul de ie�ire(output) nu le suport�."
-
-#: src/write-po.c:1101
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
-
-#: src/write-po.c:1108
-#, no-c-format
-msgid "standard output"
-msgstr "ie�ire(output) standard"
+msgid ""
+"The following msgid contains non-ASCII characters.\n"
+"This will cause problems to translators who use a character encoding\n"
+"different from yours. Consider using a pure ASCII msgid instead.\n"
+"%s\n"
+msgstr ""
+"Urm�torul msgid con�ine caractere non-ASCII.\n"
+"Aceasta va cauza probleme traduc�torilor care folosesc o codare(encoding)\n"
+"de caractere diferit� de a voastr�. Lua�i �n considerare folosirea unui "
+"msgid\n"
+"pur ASCII �n loc.\n"
+"%s\n"
 
-#: src/write-qt.c:475
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -2646,17 +4089,81 @@ msgstr ""
 "catalogul de mesaje are traduceri �n form� plural�,\n"
 "dar formatul catalogului de mesaje Qt nu suport� manipularea pluralelor\n"
 
-#: src/write-qt.c:499
+#: src/write-qt.c:694
+#, fuzzy
+#| msgid ""
+#| "message catalog has msgid 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 untranslated strings\n"
+msgid ""
+"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"
+"dar formatul catalogului de mesaje Qt suport� Unicode doar �n �irurile "
+"traduse,\n"
+"nu �i in cele netraduse.\n"
+
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
-"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"
+"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"
 
-#: src/write-tcl.c:157
+#: src/write-resources.c:96
+#, fuzzy, c-format
+#| msgid "error while writing \"%s\" file"
+msgid "error while writing to %s subprocess"
+msgstr "eroare �n scrierea fi�ierului \"%s\""
+
+#: src/write-resources.c:133
+#, fuzzy
+#| msgid ""
+#| "message catalog has plural form translations, but the output format does "
+#| "not support them."
+msgid ""
+"message catalog has context dependent translations\n"
+"but the C# .resources format doesn't support contexts\n"
+msgstr ""
+"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
+"ie�ire(output) nu le suport�."
+
+#: src/write-resources.c:152
+#, fuzzy
+#| msgid ""
+#| "message catalog has plural form translations\n"
+#| "but the Qt message catalog format doesn't support plural handling\n"
+msgid ""
+"message catalog has plural form translations\n"
+"but the C# .resources format doesn't support plural handling\n"
+msgstr ""
+"catalogul de mesaje are traduceri �n form� plural�,\n"
+"dar formatul catalogului de mesaje Qt nu suport� manipularea pluralelor\n"
+
+#: src/write-tcl.c:159
+#, fuzzy
+#| msgid ""
+#| "message catalog has plural form translations\n"
+#| "but the Tcl message catalog format doesn't support plural handling\n"
+msgid ""
+"message catalog has context dependent translations\n"
+"but the Tcl message catalog format doesn't support contexts\n"
+msgstr ""
+"catalogul de mesaje are traduceri �n form� plural�,\n"
+"dar formatul catalogului de mesaje Tcl nu suport� manipularea pluralelor\n"
+
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -2664,187 +4171,266 @@ 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:339 src/x-python.c:388
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: �ir neterminat"
 
-#: src/x-awk.c:590
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulat� neterminat�"
 
-#: src/x-c.c:1077 src/x-java.c:899
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: avertisment: constant� caracter neterminat�"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: avertisment: caracter Unicode invalid"
 
-#: src/x-c.c:1101
-#, c-format
-msgid "%s:%d: warning: unterminated string literal"
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
 msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-glade.c:413 src/x-glade.c:420
-#, c-format
-msgid "%s:%d:%d: %s"
-msgstr "%s:%d:%d: %s"
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-glade.c:447
-#, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"Limbajul \"glade\" nu este suportat. %s se bazeaz� pe expat.\n"
-"Aceast� versiune a fost construit� f�r� expat.\n"
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-java.c:1385
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: avertisment: s-a g�sit ')' unde se a�tepta '}'"
+msgid "%s:%d: warning: unterminated character constant"
+msgstr "%s:%d: avertisment: constant� caracter neterminat�"
 
-#: src/x-java.c:1409
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
+msgid "%s:%d: warning: unterminated string literal"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-perl.c:310
-#, 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-csharp.c:225
+#, fuzzy
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+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-perl.c:1036
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: lipse�te acolad� dreapt� �n \\x{HEXNUMBER}"
+#: src/x-csharp.c:269
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-perl.c:1156
-#, 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-csharp.c:285
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-perl.c:1176
-#, 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-csharp.c:297
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-perl.c:1210
-#, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: interpolare invalid� de variabil� la \"%c\""
+#: src/x-csharp.c:306
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code.\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-perl.c:1223
-#, 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-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
+#, fuzzy, c-format
+#| msgid "iconv failure"
+msgid "%s:%d: iconv failure"
+msgstr "eroare iconv"
 
-#: src/x-perl.c:1240
-#, 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-csharp.c:338
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code.\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-perl.c:2997
-#, c-format
-msgid "%s:%d: fatal: plural message seen before singular message\n"
-msgstr "%s:%d: fatal: mesaj plural �nt�lnit �nainte de mesajul singular\n"
+#: src/x-csharp.c:1451 src/x-java.c:668
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated string constant"
+msgstr "%s:%d: avertisment: �ir neterminat"
 
-#: src/x-python.c:588
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: avertisment: caracter Unicode invalid"
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr "%s:%d: avertisment: s-a g�sit ')' unde se a�tepta '}'"
 
-#: src/x-rst.c:107
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: defini�ie invalid� de �ir"
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
 
-#: src/x-rst.c:171
+#: src/xgettext.c:567
 #, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d: lipse�te num�r dup� #"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr ""
 
-#: src/x-rst.c:206
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: expresie �ir invalid�"
+#: src/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "limbajul `%s' este necunoscut"
 
-#: src/x-sh.c:1010
+#: src/xgettext.c:646
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: avertisment: sintaxa $\"...\" nu se mai folose�te din motive de securitate; �nlocui�i cu eval_gettext"
+msgid "sentence end type '%s' unknown"
+msgstr ""
 
-#: src/xgettext.c:515
+#: src/xgettext.c:701
 #, 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"
+msgstr ""
+"--join-existing nu poate fi folosit c�nd output-ul este scris la stdout"
 
-#: src/xgettext.c:520
+#: src/xgettext.c:705
 #, 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:661
+#: src/xgettext.c:839
 #, 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"
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr ""
 
-#: src/xgettext.c:712
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+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:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "Extrage �irurile traductibile din fi�ierele de intrare(input) specificate.\n"
+msgstr ""
+"Extrage �irurile traductibile din fi�ierele de intrare(input) specificate.\n"
 
-#: src/xgettext.c:735
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 "  -d, --default-domain=NUME      folose�te NUME.po pentru output \n"
 "(�n loc de messages.po)\n"
 
-#: src/xgettext.c:737
+#: src/xgettext.c:1052
 #, 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"
+msgstr ""
+"  -o, --output=FI�IER              scrie output-ul �n fi�ierul specificat\n"
 
-#: src/xgettext.c:739
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"  -p, --output-dir=DIR           fi�ierele de ie�ire(output) vor fi plasate �n \n"
+"  -p, --output-dir=DIR           fi�ierele de ie�ire(output) vor fi plasate "
+"�n \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:744
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fi�ierelor de intrare(input):\n"
 
-#: src/xgettext.c:746
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Smalltalk, Java,\n"
+#| "                                JavaProperties, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Smalltalk, Java,\n"
-"                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NUME            recunoa�te limbajul specificat\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Smalltalk, Java,\n"
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:752
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurt�tur� pentru --language=C++\n"
 
-#: src/xgettext.c:754
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr ""
-"Implicit limbajul este ghicit depinz�nd de extensia numelui fi�ierului de intrare \n"
+"Implicit limbajul este ghicit depinz�nd de extensia numelui fi�ierului de "
+"intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:759
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -2853,237 +4439,816 @@ msgstr ""
 "      --from-code=NUME        codare pentru fi�ierele de intrare(input)\n"
 "                                (except�nd Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:762
+#: src/xgettext.c:1078
 #, 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:767
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing            al�tur� mesajele fi�ierului existent\n"
+msgstr ""
+"  -j, --join-existing            al�tur� mesajele fi�ierului existent\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=FI�IER.po     intr�rile din FI�IER.po nu vor fi "
+"extrase\n"
+
+#: src/xgettext.c:1087
+#, fuzzy, c-format
+#| msgid ""
+#| "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+#| "                              preceding keyword lines) in output file\n"
+msgid ""
+"  -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 "
+"cu\n"
+"                                 cuvinte cheie) �n fi�ierul de "
+"ie�ire(output)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
-"  -c, --add-comments[=ETICHET�]       plaseaz� blocul de comentarii cu\n"
-"                                 ETICHET� (sau pe acelea care preced liniile cu\n"
-"                                 cuvinte cheie) �n fi�ierul de ie�ire(output)\n"
 
-#: src/xgettext.c:775
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Op�iuni specifice limbajului:\n"
 
-#: src/xgettext.c:777
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate �irurile\n"
 
-#: src/xgettext.c:779 src/xgettext.c:786
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Java, "
+#| "awk,\n"
+#| "                                Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
-"                                Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
 
-#: src/xgettext.c:783
-#, c-format
+#: src/xgettext.c:1113
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Java, "
+#| "awk,\n"
+#| "                                Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"  -k, --keyword[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
-"                                  CUV�NT �nseamn� neutilizarea cuvintelor_cheie\n"
-"                                  implicite)\n"
+"                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
 
-#: src/xgettext.c:790
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=CUV�NT:ARG:MARCAJ    marcaj(flag) adi�ional pentru �iruriledin argumentul\n"
+"      --flag=CUV�NT:ARG:MARCAJ    marcaj(flag) adi�ional pentru �iruriledin "
+"argumentul\n"
 "                              num�rul ARG al cuv�ntului cheie CUV�NT\n"
 
-#: src/xgettext.c:793
-#, c-format
+#: src/xgettext.c:1121
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Java, "
+#| "awk,\n"
+#| "                                YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
-"                                YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-surs�)\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
-"  -T, --trigraphs                accept�(understand) trigrafuri ANSI C pentru intrare\n"
+"  -T, --trigraphs                accept�(understand) trigrafuri ANSI C "
+"pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:799
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FI�IER          ob�ine lista de fi�iere de intrare din "
+"FI�IER\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (doar limbajul C++)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:1138
+#, fuzzy, c-format
+#| msgid "      --qt                    recognize Qt format strings\n"
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
+
+#: src/xgettext.c:1142
+#, fuzzy, c-format
+#| msgid "      --qt                    recognize Qt format strings\n"
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
+
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                    rezultat mai detaliat al recunoa�terii formatstring\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                    rezultat mai detaliat al recunoa�terii "
+"formatstring\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:1171
 #, 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:839
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr ""
+"      --indent                   scrie fi�ierul .po folosind stil indentat\n"
+
+#: src/xgettext.c:1188
 #, 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"
+msgstr ""
+"      --copyright-holder=�IR  seteaz� de�in�torul copyright-ului la "
+"ie�ire(output)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          omite copyright FSF la ie�ire pentru user str�in(foreign)\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          omite copyright FSF la ie�ire pentru user "
+"str�in(foreign)\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:1192
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
-"      --msgid-bugs-address=EMAIL@ADRES�  seteaz� adresa de reportare a\n"
-"bug-urilor msgid\n"
 
-#: src/xgettext.c:845
-#, c-format
-msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
-msgstr "  -m, --msgstr-prefix[=�IR]  folose�te �IR sau \"\" ca prefix pentru intr�rile msgstr\n"
+#: src/xgettext.c:1194
+#, fuzzy, c-format
+#| msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+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:847
+#: src/xgettext.c:1196
 #, c-format
-msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
-msgstr "  -M, --msgstr-suffix[=�IR]  folose�te �IR sau \"\" ca suefix pentru intr�rile msgstr\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ADRES�  seteaz� adresa de reportare a\n"
+"bug-urilor msgid\n"
 
-#: src/xgettext.c:1434
+#: src/xgettext.c:1198
+#, fuzzy, c-format
+#| msgid ""
+#| "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:1201
+#, fuzzy, c-format
+#| msgid ""
+#| "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:1597
 #, c-format
-msgid "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"
+msgid ""
+"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:1480
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:1592
-#, c-format
+#: src/xgettext.c:1872
+#, fuzzy
+#| msgid ""
+#| "The option --msgid-bugs-address was not specified.\n"
+#| "If you are using a `Makevars' file, please specify\n"
+#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+#| "specify an --msgid-bugs-address command line option.\n"
 msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Op�iunea --msgid-bugs-address nu a fost specificat�.\n"
+"Dac� folosi�i un fi�ier `Makevars', v� rug�m specifica�i\n"
+"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:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "limbajul `%s' este necunoscut"
+
+#: src/x-javascript.c:231
+#, fuzzy
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
+
+#: src/x-javascript.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
+
+#: src/x-javascript.c:291
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
+
+#: src/x-javascript.c:303
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
+
+#: src/x-javascript.c:312
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"�ir non-ASCII la %s%s.\n"
+"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
+
+#: src/x-javascript.c:344
+#, fuzzy, c-format
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
 msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "%s:%lu: warning: syntax error"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%lu: avertisment: eroare de sintax�"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: avertisment: �ir neterminat"
+
+#: src/x-perl.c:339
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: avertisment: "
+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/xgettext.c:1653
+#: src/x-perl.c:1074
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: lipse�te acolad� dreapt� �n \\x{HEXNUMBER}"
+
+#: src/x-perl.c:1195
+#, 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:1215
+#, 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:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: interpolare invalid� de variabil� la \"%c\""
+
+#: src/x-perl.c:1262
+#, 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:1279
+#, 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:279
+msgid ""
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 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:1653
+#: src/x-python.c:325
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"De�i este declarat astfel, %s nu este un format al �irului valid %s: Motiv:\n"
-"%s\n"
 
-#: src/xgettext.c:1708
+#: src/x-python.c:342
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"msgid vid.  Este rezervat de GNU gettext:\n"
-"gettext(\"\") returneaz� header-ul cu informa�ii\n"
-"meta, nu cu �irul vid.\n"
 
-#: src/xgettext.c:1990
+#: src/x-python.c:355
+#, c-format
 msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Op�iunea --msgid-bugs-address nu a fost specificat�.\n"
-"Dac� folosi�i un fi�ier `Makevars', v� rug�m specifica�i\n"
-"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:2179
+#: src/x-python.c:365
 #, c-format
-msgid "language `%s' unknown"
-msgstr "limbajul `%s' este necunoscut"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:398
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+
+#: src/x-python.c:654
+#, c-format
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr ""
+
+#: src/x-rst.c:116
+#, c-format
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: defini�ie invalid� de �ir"
+
+#: src/x-rst.c:180
+#, c-format
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d: lipse�te num�r dup� #"
+
+#: src/x-rst.c:215
+#, c-format
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: expresie �ir invalid�"
+
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: defini�ie invalid� de �ir"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: defini�ie invalid� de �ir"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: avertisment: sintaxa $\"...\" nu se mai folose�te din motive de "
+"securitate; �nlocui�i cu eval_gettext"
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
+
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr ""
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "secven�� de control invalid�"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "nu este un nume valid de clas� Java: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "nu este un nume valid de clas� Java: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "secven�� de control invalid�"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid multibyte sequence"
+msgid "invalid entity reference: %s"
+msgstr "secven�� multibyte invalid�"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument `%s' for `%s'"
+msgid "invalid character after '%s'"
+msgstr "parametru invalid `%s' pentru `%s'"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "lipse�te numele de filtru"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, c-format
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `--%s' nu permite parametri\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: op�iune necunoscut� `--%s'\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: op�iune ilegal� -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
+
+#, c-format
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle a e�uat cu cod de eroare 0x%08x"
+
+#, c-format
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Referin�e multiple la % % %c."
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Acesta este software liber; citi�i sursa pentru condi�ii de copiere.  NU exist� NICI o \n"
+#~ "garan�ie; nici m�car pentru VANDABILITATE sau MODIFICARE �NTR-UN SCOP PRIVAT.\n"
+
+#, c-format
+#~ msgid "Not yet implemented."
+#~ msgstr "Neimplimentat �nc�."
+
+#, 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"
+
+#, c-format
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "avertisment: headerul fi�ierului PO este neclar(fuzzy)\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "scrierea �n subprocesul grep a e�uat"
+
+#, c-format
+#~ msgid "conversion failure"
+#~ msgstr "eroare de conversie"
+
+#, c-format
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avertisment: "
+
+#, c-format
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#, c-format
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: avertisment: �ir neterminat"
+
+#, c-format
+#~ msgid "%s:%d:%d: %s"
+#~ msgstr "%s:%d:%d: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Limbajul \"glade\" nu este suportat. %s se bazeaz� pe expat.\n"
+#~ "Aceast� versiune a fost construit� f�r� expat.\n"
+
+#, c-format
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: fatal: mesaj plural �nt�lnit �nainte de mesajul singular\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: avertisment: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ 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"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#~ 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 ""
+#~ "msgid vid.  Este rezervat de GNU gettext:\n"
+#~ "gettext(\"\") returneaz� header-ul cu informa�ii\n"
+#~ "meta, nu cu �irul vid.\n"
 
-#: src/user-email.sh.in:340
-msgid "Which is your email address?"
-msgstr "Care este adresa voastr� de email?"
+#~ msgid "Which is your email address?"
+#~ msgstr "Care este adresa voastr� de email?"
 
-#: src/user-email.sh.in:342
-msgid "Please choose the number, or enter your email address."
-msgstr "V� rug�m alege�i un num�r, sau introduce�i adresa voastr� de e-mail."
+#~ msgid "Please choose the number, or enter your email address."
+#~ msgstr ""
+#~ "V� rug�m alege�i un num�r, sau introduce�i adresa voastr� de e-mail."
 
-#: src/user-email.sh.in:360 src/user-email.sh.in:384 src/user-email.sh.in:403
-msgid "Invalid email address: invalid character."
-msgstr "Adres� email invalid�: caracter invalid."
+#~ msgid "Invalid email address: invalid character."
+#~ msgstr "Adres� email invalid�: caracter invalid."
 
-#: src/user-email.sh.in:362 src/user-email.sh.in:386 src/user-email.sh.in:405
-msgid "Invalid email address: need a fully qualified host name or domain name."
-msgstr "Adres� email invalid�: e nevoie de un nume de host sau de domeniu complet calificat."
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr ""
+#~ "Adres� email invalid�: e nevoie de un nume de host sau de domeniu complet "
+#~ "calificat."
 
-#: src/user-email.sh.in:363 src/user-email.sh.in:387 src/user-email.sh.in:406
-msgid "Invalid email address: missing @"
-msgstr "Adres� email invalid�: lipse�te @"
+#~ msgid "Invalid email address: missing @"
+#~ msgstr "Adres� email invalid�: lipse�te @"
 
-#: src/user-email.sh.in:372
-msgid "Is the following your email address?"
-msgstr "Este aceasta adresa voastr� de e-mail?"
+#~ msgid "Is the following your email address?"
+#~ msgstr "Este aceasta adresa voastr� de e-mail?"
 
-#: src/user-email.sh.in:374
-msgid "Please confirm by pressing Return, or enter your email address."
-msgstr "V� rug�m confirma�i prin ap�sarea tastei Return, sau introduce�i adresa voastr� de email."
+#~ msgid "Please confirm by pressing Return, or enter your email address."
+#~ msgstr ""
+#~ "V� rug�m confirma�i prin ap�sarea tastei Return, sau introduce�i adresa "
+#~ "voastr� de email."
 
-#: src/user-email.sh.in:395
-msgid "Couldn't find out about your email address."
-msgstr "Nu se poate afla nimic despre adresa voastr� de e-mail."
+#~ msgid "Couldn't find out about your email address."
+#~ msgstr "Nu se poate afla nimic despre adresa voastr� de e-mail."
 
-#: src/user-email.sh.in:397
-msgid "Please enter your email address."
-msgstr "V� rug�m introduce�i adresa voastr� de email."
+#~ msgid "Please enter your email address."
+#~ msgstr "V� rug�m introduce�i adresa voastr� de email."
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index 7de639056..73df927f3 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -3,34 +3,36 @@
 # This file is distributed under the same license as the gettext package.
 #
 # Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001-2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2016.
 # Pavel Maryanov <acid@jack.kiev.ua>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.3\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-10-16 15:04+0900\n"
-"PO-Revision-Date: 2014-11-19 09:30+0200\n"
-"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-06-12 08:38+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <gnu@d07.ru>\n"
 "Language: ru\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"
-"X-Generator: Poedit 1.6.9\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+"X-Generator: Lokalize 1.5\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "неверный аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "неоднозначный аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Допустимые аргументы:"
 
@@ -58,195 +60,186 @@ msgstr "невозможно удалить временный каталог %s
 msgid "write error"
 msgstr "ошибка записи"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "сохранение прав доступа для %s"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "ошибка при открытии файла %s для чтения"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "не удалось открыть файл резервной копии %s для записи"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "ошибка чтения %s"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "ошибка записи %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "ошибка после чтения %s"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "ошибка при вызовы fdopen()"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Не найден компилятор C#, попробуйте поставить pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Не найдена виртуальная машина C#, попробуйте поставить pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Неизвестная системная ошибка"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "дочерний процесс %s завершился неуспехом"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: двусмысленный параметр «%s»\n"
+
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: у параметра «--%s» не может быть аргумента\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: неизвестный параметр «%c%s»\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: для параметра «--%s» требуется аргумент\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неизвестный параметр «--%s»\n"
-
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неизвестный параметр «%c%s»\n"
-
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: недопустимый параметр — «%c»\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: для параметра требуется аргумент — «%c»\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр «-W %s»\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для параметра «-W %s» требуется аргумент\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "неправильный аргумент source_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неправильный аргумент target_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ошибка при создании «%s»"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
-#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ошибка записи файла «%s»"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Не найден компилятор Java, поставьте gcj или установите переменную $JAVAC"
+msgstr ""
+"Не найден компилятор Java, поставьте gcj или установите переменную $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Не найдена виртуальная машина Java, поставьте gij или установите переменную $JAVA"
+msgstr ""
+"Не найдена виртуальная машина Java, поставьте gij или установите переменную "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
-#: src/msginit.c:1141
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "ошибка ввода/вывода в дочернем процессе %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "память исчерпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "ошибка при создании нитей"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "ошибка при записи в дочерний процесс %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "ошибка при чтении из дочернего процесса %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
+msgstr ""
+"невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
 
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "ошибка при попытке связи с дочерним процессом %s"
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "дочерний процесс %s завершился с выходным кодом %d"
@@ -270,13 +263,13 @@ msgstr "дочерний процесс %s завершился с выходн�
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "»"
 
@@ -285,56 +278,212 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "установка прав доступа для %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "невозможно создать канал"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ошибка при _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не удалось восстановить fd %d: ошибка dup2"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "дочерний процесс %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "дочерний процесс %s получил фатальный сигнал %d"
 
-#: 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:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "ошибка открытия файла «%s» для чтения"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:151
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "Строка «%s» не подходит под формат %s, в отличие от исходной «%s». Причина: %s"
+msgid "The root element must be <%s>"
+msgstr "Корневой элемент должен быть <%s>"
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "Элемент <%s> не содержит элемента <%s>"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr "Элемент <%s> не имеет атрибута <%s>"
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Использование: %s [ПАРАМЕТР…] [ЛОКАЛЬ ПРАВИЛА]…\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+"Извлекает или преобразует правила формы множественного числа Unicode CLDR.\n"
+"\n"
+"Если указана ЛОКАЛЬ и ПРАВИЛА одновременно, то читает правила формы\n"
+"множественного числа CLDR для ЛОКАЛИ из ПРАВИЛ и печатает их в форме,\n"
+"пригодной для gettext. Если аргумент не указан, то правила формы\n"
+"множественного числа CLDR из стандартного ввода.\n"
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
+"То же и для необязательных аргументов.\n"
+
+#: src/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr ""
+"  -c, --cldr                  вывести правила формы множественного числа\n"
+"                              в формате CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  показать эту справку и выйти\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               показать информацию о версии и выйти\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
+"Это свободное ПО: вы можете продавать и распространять его.\n"
+"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Автор программы — %s.\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr "Daiki Ueno"
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr "невозможно прочитать %s"
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr "невозможно извлечь правила для %s"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr "не удалось разобрать правило CLDR"
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr "лишний операнд %s"
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+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-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "спецификация формата аргумента %u в «%s» не существует в «%s»"
 
 #: 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-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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'"
@@ -342,8 +491,8 @@ msgstr "спецификация формата аргумента %u не су�
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
 #: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
 #: src/format-tcl.c:421
 #, c-format
@@ -355,57 +504,76 @@ msgstr "спецификации формата в «%s» и «%s» не сов�
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Директива номер %u начинается с |, но не заканчивается на |."
 
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr ""
+"Строка «%s» не подходит под формат %s, в отличие от исходной «%s». Причина: "
+"%s"
+
 #: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "В директиве номер %u лексема после «<» не является именем макроса-спецификации формата. Допустимые имена макросов перечислены в ISO C 99, раздел 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"В директиве номер %u лексема после «<» не является именем макроса-"
+"спецификации формата. Допустимые имена макросов перечислены в ISO C 99, "
+"раздел 7.8.1."
 
 #: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "В директиве номер %u после лексемы, стоящей за «<», нет закрывающего «>»."
+msgstr ""
+"В директиве номер %u после лексемы, стоящей за «<», нет закрывающего «>»."
 
 #: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Строка ссылается на аргумент номер %u, но игнорирует аргумент номер %u."
+msgstr ""
+"Строка ссылается на аргумент номер %u, но игнорирует аргумент номер %u."
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не совпадает количество спецификаций формата в «%s» и «%s»"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "В директиве номер %u после «{» не стоит номер аргумента."
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "В директиве номер %u после «,» не стоит число."
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Директива номер %u заканчивается на неверный символ «%c», а не на «}»."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Директива номер %u заканчивается на неверный символ, а не на «}»."
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Строка содержит непарную «}» после директивы номер %u."
@@ -422,13 +590,19 @@ msgstr "В директиве номер %u перед «%c» нельзя ук�
 
 #: 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 номер аргумента для точности должен быть равно %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"В директиве номер %u номер аргумента для точности должен быть равно %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "В директиве номер %u перед «%c» нельзя указывать спецификацию точности."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"В директиве номер %u перед «%c» нельзя указывать спецификацию точности."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -465,33 +639,56 @@ msgid "The string ends in the middle of a directive."
 msgstr "Строка обрывается посреди директивы."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Строка ссылается на аргументы как по абсолютным номерам, так и через ненумерованные спецификации аргументов."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Строка ссылается на аргументы как по абсолютным номерам, так и через "
+"ненумерованные спецификации аргументов."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "В директиве номер %u аргумент с номером 0 не является положительным целым числом."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr ""
+"В директиве номер %u аргумент с номером 0 не является положительным целым "
+"числом."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "В директиве номер %u ширина аргумента с номером 0 не является положительным целым числом."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"В директиве номер %u ширина аргумента с номером 0 не является положительным "
+"целым числом."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "В директиве номер %u точность аргумента с номером 0 не является положительным целым числом."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"В директиве номер %u точность аргумента с номером 0 не является "
+"положительным целым числом."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "В директиве номер %u символ «%c» не является верным спецификатором преобразования."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"В директиве номер %u символ «%c» не является верным спецификатором "
+"преобразования."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Символ, завершающий директиву номер %u не является верным спецификатором преобразования."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Символ, завершающий директиву номер %u не является верным спецификатором "
+"преобразования."
 
 #: src/format-invalid.h:40
 #, c-format
@@ -500,8 +697,11 @@ msgstr "Строка ссылается на аргумент номер %u не
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "В директиве номер %u подстрока «%s» не является верным стилем даты/времени."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"В директиве номер %u подстрока «%s» не является верным стилем даты/времени."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -510,13 +710,18 @@ msgstr "В директиве номер %u после «%s» не стоит з
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "В директиве номер %u подстрока «%s» не является верным стилем числа."
 
 #: src/format-java.c:323
 #, c-format
-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»."
+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»."
 
 #: src/format-java.c:572
 #, c-format
@@ -525,12 +730,17 @@ msgstr "В директиве номер %u оператор выбора не �
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "В директиве номер %u оператор выбора содержит число, за которым не следует «<», «#» или «%s»."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"В директиве номер %u оператор выбора содержит число, за которым не следует "
+"«<», «#» или «%s»."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "спецификация формата аргумента {%u} в «%s» не существует в «%s»"
 
 #: src/format-java.c:756
@@ -540,88 +750,164 @@ msgstr "для аргумента {%u} нет спецификации форм�
 
 #: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента {%u}"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-kde.c:158
+#, c-format
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Строка ссылается на аргумент номер %u, но игнорирует аргументы %u и %u."
+
+#: src/format-kde.c:242
+#, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"спецификация формата аргументов %u и %u не существует в «%s», только один "
+"аргумент может быть игнорирован"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
-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»."
+msgid "error while parsing: %s"
+msgstr "ошибка при разборе: %s"
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "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."
-msgstr[0] "В директиве номер %u указано слишком много параметров; ожидалось не более %u параметра"
-msgstr[1] "В директиве номер %u указано слишком много параметров; ожидалось не более %u параметров"
-msgstr[2] "В директиве номер %u указано слишком много параметров; ожидалось не более %u параметров"
+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»."
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
+"параметра"
+msgstr[1] ""
+"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
+"параметров"
+msgstr[2] ""
+"В директиве номер %u указано слишком много параметров; ожидалось не более %u "
+"параметров"
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "В директиве номер %u после «%c» не стоит цифра."
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "В директиве номер %u аргумент %d отрицателен."
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Строка обрывается посреди директивы ~/.../."
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Встречено «~%c» без соответствующего «~%c»."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "В директиве номер %u одновременно заданы модификаторы @ и :."
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "В директиве номер %u после «~:[» не стоят два предложения, разделенные «~;»."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"В директиве номер %u после «~:[» не стоят два предложения, разделенные «~;»."
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "В директиве номер %u «~;» использована в неверном месте."
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Строка ссылается на какой-то аргумент несовместимым образом."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "спецификации формата в «%s» и «%s» не эквивалентны"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "спецификации формата в «%s» не являются подмножеством спецификаций из «%s»"
+msgstr ""
+"спецификации формата в «%s» не являются подмножеством спецификаций из «%s»"
+
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "В директиве номер %u спецификатор размера несовместим со спецификатором преобразования «%c»."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"В директиве номер %u спецификатор размера несовместим со спецификатором "
+"преобразования «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-python-brace.c:138
 #, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "для аргумента «%s» нет спецификации формата в «%s»"
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "В директиве номер %u с «%c» не может начинаться имя поля."
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "В директиве номер %u с «%c» не может начинаться аргумент getattr."
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "В директиве номер %u с «%c» не может начинаться аргумент getitem."
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"В директиве номер %u в спецификаторе формата невозможно указать большую "
+"вложенность."
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "В директиве номер %u есть незавершённая директива формата."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Строка ссылается на аргументы как по именам, так и по безымянным спецификациям аргументов."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Строка ссылается на аргументы как по именам, так и по безымянным "
+"спецификациям аргументов."
 
 #: src/format-python.c:354
 #, c-format
@@ -630,65 +916,58 @@ msgstr "Строка ссылается на аргумент по имени «
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "спецификация формата в «%s» ожидает отображение, а в «%s» — кортеж"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "спецификация формата в «%s» ожидает кортеж, а в «%s» — отображение"
 
 #: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "спецификация формата аргумента «%s» в «%s» не существует в «%s»"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента «%s»"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "В директиве номер %u с «%c» не может начинаться имя поля."
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "В директиве номер %u с «%c» не может начинаться аргумент getattr."
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "В директиве номер %u с «%c» не может начинаться аргумент getitem."
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "В директиве номер %u в спецификаторе формата невозможно указать большую вложенность."
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "В директиве номер %u есть незавершённая директива формата."
-
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "«%s» является простой строкой формата, но «%s» нет: в ней содержится флаг «L» или аргумент с числом из двух цифр"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"«%s» является простой строкой формата, но «%s» нет: в ней содержится флаг "
+"«L» или аргумент с числом из двух цифр"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Строка ссылается на переменную оболочки с именем, не представимым в ASCII."
+msgstr ""
+"Строка ссылается на переменную оболочки с именем, не представимым в ASCII."
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Строка ссылается на переменную оболочки со сложным синтактисом фигурных скобок.  Этот синтактис не поддерживается в этой программе по соображениям безопасности."
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Строка ссылается на переменную оболочки со сложным синтактисом фигурных "
+"скобок.  Этот синтактис не поддерживается в этой программе по соображениям "
+"безопасности."
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Строка ссылается на переменную оболочки, чье значение может оказаться иным внутри функций оболочки."
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Строка ссылается на переменную оболочки, чье значение может оказаться иным "
+"внутри функций оболочки."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
@@ -696,152 +975,148 @@ msgstr "Строка ссылается на переменную оболочк
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "В директиве номер %u символ «%c» не является цифрой между 1 и 9."
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Символ, завершающий директиву номер %u не является цифрой между 1 и 9."
-
-#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
-#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
-#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
-"Это свободное ПО: вы можете продавать и распространять его.\n"
-"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
-
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
-#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
-#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
-#: src/xgettext.c:621
-#, c-format
-msgid "Written by %s.\n"
-msgstr "Автор программы — %s.\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr "Символ, завершающий директиву номер %u не является цифрой между 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
-#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
-#: src/urlget.c:149
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Бруно Хайбл"
 
-#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "слишком много аргументов"
 
-#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
-#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
-#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
-
-#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Использование: %s [ПАРАМЕТР]\n"
 
-#: src/hostname.c:217
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Печатает имя данной машины.\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Формат вывода:\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 короткое имя машины\n"
 
-#: src/hostname.c:224
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          длинное имя машины, включает полностью\n"
 "                                заданное доменное имя и псевдонимы\n"
 
-#: src/hostname.c:227
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреса для заданного имени машины\n"
 
-#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
-#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
-#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Информационный вывод:\n"
 
-#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
-#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
-#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  показать эту справку и выйти\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "невозможно получить имя машины"
 
-#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
-#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
-#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               показать информацию о версии и выйти\n"
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
+msgstr "не указан селектор"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
-#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
-#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr "невозможно создать контекст XPath"
 
-#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "невозможно получить имя машины"
+msgid "cannot evaluate XPath expression: %s"
+msgstr "невозможно вычислить выражение XPath: %s"
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr "узел «%s» не содержит «%s»"
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "неверное значение атрибута «%s» для «%s»"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr "корневой элемент вне «rules» в пространстве имён %s"
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "невозможно прочитать %s: %s"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr "невозможно вычислить путь расположения XPath: %s"
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr "узел «%s» не содержит «%s»"
+
+#: src/locating-rule.c:307
+#, c-format
+msgid "cannot read XML file %s"
+msgstr "невозможно прочитать XML-файл %s"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr "корневой элемент не «locatingRules»"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "принимается не более одного входного файла"
 
-#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
-#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
-#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
-#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
-#: src/xgettext.c:644
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s взаимно исключают друг друга"
@@ -860,18 +1135,20 @@ msgstr ""
 "Фильтрует сообщения каталога переводов в соответствии с их атрибутами\n"
 "и манипулирует этими атрибутами.\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
-#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
 #: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
-#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Нахождение входного файла:\n"
@@ -881,37 +1158,41 @@ msgstr "Нахождение входного файла:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХОДНОЙ-ФАЙЛ                входной PO-файл\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
-#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=КАТАЛОГ     добавить КАТАЛОГ к пути поиска входных файлов\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=КАТАЛОГ     добавить КАТАЛОГ к пути поиска входных файлов\n"
 
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
 #: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Если входной файл не задан или задан как -, читается стандартный ввод.\n"
+msgstr ""
+"Если входной файл не задан или задан как -, читается стандартный ввод.\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
-#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Нахождение выходного файла:\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
-#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записать вывод в указанный файл\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
 #: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
@@ -921,40 +1202,50 @@ msgstr ""
 "Результаты выводятся на стандартный вывод, если выходной файл не задан\n"
 "или задан как -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Выбор сообщений:\n"
 
 #: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            сохранить переведенные, удалить непереведённые\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            сохранить переведенные, удалить "
+"непереведённые\n"
 
 #: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          сохранить непереведённые, удалить переведенные\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          сохранить непереведённые, удалить "
+"переведенные\n"
 
 #: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              удалить сообщения помеченные как «неточные»\n"
+msgstr ""
+"      --no-fuzzy              удалить сообщения помеченные как «неточные»\n"
 
 #: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            сохранить сообщения помеченные как «неточные»\n"
+msgstr ""
+"      --only-fuzzy            сохранить сообщения помеченные как «неточные»\n"
 
 #: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           удалить сообщения, помеченные как «старые»\n"
+msgstr ""
+"      --no-obsolete           удалить сообщения, помеченные как «старые»\n"
 
 #: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         сохранить сообщения, помеченные как «старые»\n"
+msgstr ""
+"      --only-obsolete         сохранить сообщения, помеченные как «старые»\n"
 
 #: src/msgattrib.c:465
 #, c-format
@@ -992,24 +1283,32 @@ msgstr ""
 
 #: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        удалить «предыдущий msgid» из всех сообщений\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        удалить «предыдущий msgid» из всех сообщений\n"
 
 #: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
 "      --empty                 при удалении «неточных», также делать\n"
 "                              msgstr пустой\n"
 
 #: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=ФАЙЛ.po     обработать сообщения, перечисленные в ФАЙЛЕ.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=ФАЙЛ.po     обработать сообщения, перечисленные в ФАЙЛЕ."
+"po\n"
 
 #: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=ФАЙЛ.po   обработать сообщения, не перечисленные\n"
 "                              в ФАЙЛЕ.po\n"
@@ -1021,136 +1320,155 @@ msgstr "      --fuzzy                 синоним для --only-fuzzy --clear
 
 #: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              синоним для --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              синоним для --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
-#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
 #: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис входного файла:\n"
 
-#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      входной файл имеет синтаксис Java .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      входной файл имеет синтаксис Java .properties\n"
 
-#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     входной файл имеет синтаксис NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     входной файл имеет синтаксис NeXTstep/GNUstep ."
+"strings\n"
 
-#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
-#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробности выходного формата:\n"
 
-#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
-#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 всегда использовать цвета и другие\n"
 "                              текстовые атрибуты\n"
-"      --color=КОГДА           использовать цвета и другие текстовые                               атрибуты в соответствии с КОГДА\n"
+"      --color=КОГДА           использовать цвета и другие "
+"текстовые                               атрибуты в соответствии с КОГДА\n"
 "                              КОГДА может быть: «always» (всегда),\n"
 "                              «never» (никогда), «auto» или «html»\n"
 
-#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
-#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=ФАЙЛ_СТИЛЯ      указать файл правил стилей CSS для --color\n"
+msgstr ""
+"      --style=ФАЙЛ_СТИЛЯ      указать файл правил стилей CSS для --color\n"
 
-#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             не использовать при выводе экранирующие\n"
 "                              последовательности языка C (по умолчанию)\n"
 
-#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                использовать экранирующие последовательности,\n"
 "                              а не расширенные символы\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              записать PO-файл, даже если он пуст\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                форматировать PO-файл, используя отступы\n"
+msgstr ""
+"  -i, --indent                форматировать PO-файл, используя отступы\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           не писать строки «#: файл:строка»\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          генерировать строки «#: файл:строка»\n"
 "                              (по умолчанию)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                вывод в режиме строгого соответствия стандарту\n"
+"      --strict                вывод в режиме строгого соответствия "
+"стандарту\n"
 "                                Uniforum\n"
 
-#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
-#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записать .properties-файл Java\n"
 
-#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    записать .strings-файл NeXTstep/GNUstep\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    записать .strings-файл NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
-#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ЧИСЛО           задает ширину выходной страницы\n"
 
-#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
-#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1159,31 +1477,31 @@ msgstr ""
 "      --no-wrap               не разбивать длинные строки, которые длиннее\n"
 "                              ширины выходной страницы\n"
 
-#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           сортировать вывод\n"
 
-#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          сортировать вывод по именам файлов\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Использование: %s [ПАРАМЕТР] [ВХОДНОЙ-ФАЙЛ]…\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1206,23 +1524,24 @@ msgstr ""
 "но если задан параметр --use-first, то они берутся из первого PO-файла,\n"
 "в котором были определены.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХОДНОЙ-ФАЙЛ...             входные файлы\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=ФАЙЛ       получить список входных файлов из ФАЙЛА\n"
+msgstr ""
+"  -f, --files-from=ФАЙЛ       получить список входных файлов из ФАЙЛА\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Если входной файл задан как -, читается стандартный ввод.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1232,7 +1551,7 @@ msgstr ""
 "                              определений меньше заданного ЧИСЛА\n"
 "                              (по умолчанию не ограничено)\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1242,7 +1561,7 @@ msgstr ""
 "                              определений больше заданного ЧИСЛА\n"
 "                              (по умолчанию больше нуля)\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1251,28 +1570,32 @@ msgstr ""
 "  -u, --unique                сокращение для --less-than=2, запрашивает\n"
 "                              печать только уникальных сообщений\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:575
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      входные файлы имеют синтаксис Java .properties\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      входные файлы имеют синтаксис Java ."
+"properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:577
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     входные файлы имеют синтаксис NeXTstep/GNUstep\n"
+"      --stringtable-input     входные файлы имеют синтаксис NeXTstep/"
+"GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЯ           выходная кодировка\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1281,32 +1604,33 @@ msgstr ""
 "      --use-first             использовать первый доступный перевод для\n"
 "                              каждого сообщения, не объединять переводы\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=ИМЯ_КАТАЛОГА     задать поле «Language» в заголовке\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Питер Миллер"
 
-#: src/msgcmp.c:189 src/msgmerge.c:373
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "не заданы входные файлы"
 
-#: src/msgcmp.c:194 src/msgmerge.c:378
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "необходимо задать два входных файла"
 
-#: src/msgcmp.c:213 src/msgmerge.c:498
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Использование: %s [ПАРАМЕТР] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1324,37 +1648,40 @@ msgstr ""
 "Для улучшения диагностики используется приблизительное сравнение, если\n"
 "нельзя найти точное совпадение.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      переводы\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ссылки на исходники\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:564
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Модификаторы режима работы:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:566
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:568
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     не применять нечеткое сопоставление\n"
 
-#: src/msgcmp.c:245
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             использовать неточные записи\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      использовать непереведённые записи\n"
@@ -1369,17 +1696,17 @@ msgstr "это сообщение не переведено"
 msgid "this message needs to be reviewed by the translator"
 msgstr "это сообщение должно быть проверено переводчиком"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1518
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "это сообщение используется программой, но не было определено..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1521
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...однако здесь определено похожее сообщение"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1549
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "это сообщение не было определено в %s"
@@ -1389,7 +1716,7 @@ msgstr "это сообщение не было определено в %s"
 msgid "warning: this message is not used"
 msgstr "предупреждение: это сообщение не используется"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1397,12 +1724,12 @@ msgstr[0] "найдена %d критическая ошибка"
 msgstr[1] "найдено %d критические ошибки"
 msgstr[2] "найдено %d критических ошибок"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необходимо задать не менее двух файлов"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1422,7 +1749,7 @@ msgstr ""
 "комментарии сохраняются, но только из первого PO-файла, в котором они\n"
 "были определены. Положения в файлах сохраняются из всех PO-файлов.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1432,10 +1759,12 @@ msgstr ""
 "                              определений больше заданного ЧИСЛА\n"
 "                              (по умолчанию больше одного)\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           не выводить заголовок с полем «msgid \"\"»\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           не выводить заголовок с полем «msgid \"\"»\n"
 
 #: src/msgconv.c:311
 #, c-format
@@ -1452,34 +1781,35 @@ msgstr "Цель преобразования:\n"
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "По умолчанию используется кодировка текущей локали.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                использовать на выводе отступы\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:599
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           убрать строки «#: файл:строка»\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:601
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          сохранять строки «#: файл:строка»\n"
 "                              (по умолчанию)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:603
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                выводить в строгом соответствии\n"
 "                              стандарту Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "не задан входной файл"
@@ -1512,17 +1842,17 @@ msgstr ""
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХОДНОЙ-ФАЙЛ                входной PO- или POT-файл\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "не задана команда"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Использование: %s [ПАРАМЕТР] КОМАНДА [ПАРАМЕТР-КОМАНДЫ]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1537,7 +1867,7 @@ msgstr ""
 "вывод отправляется на выход msgexec. Значение, возвращаемое msgexec —\n"
 "это максимальный код возврата среди всех вызовов.\n"
 
-#: src/msgexec.c:271
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1546,151 +1876,196 @@ msgstr ""
 "Специальная встроенная команда «0» выводит перевод и за ним нулевой\n"
 "байт.  Вывод «msgexec 0» подходит для передачи на вход «xargs -0».\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281
+#, c-format
+msgid "Command input:\n"
+msgstr "Ввод команды:\n"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
+msgstr ""
+"  --newline                   добавлять символ новой строки в конец ввода\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХОДНОЙ-ФАЙЛ    входной PO-файл\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "запись на стандартный вывод завершилась с ошибкой"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "не задано имя фильтра"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "необходимо задать хотя бы один сценарий sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Использование: %s [ПАРАМЕТР] ФИЛЬТР [ПАРАМЕТР-ФИЛЬТРА]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Применяет фильтр ко всем переводам каталога.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:441
 #, 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 ""
-"Фильтр может быть любой программой, читающей перевод со стандартного ввода и\n"
+"Фильтр может быть любой программой, читающей перевод со стандартного ввода "
+"и\n"
 "печатающей измененный перевод на стандартный вывод.\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr "Фильтр ввода и вывода:\n"
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+"  --newline                   добавлять символ новой строки в конец ввода\n"
+"                              удалять символ новой строки в конце вывода"
+
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Полезные ПАРАМЕТРЫ-ФИЛЬТРА в случае, если ФИЛЬТРОМ является «sed»:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СЦЕН       добавить СЦЕН к выполняемым командам\n"
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=ФАЙЛ-СЦЕН        добавить содержимое файла ФАЙЛ-СЦЕН к\n"
 "                                выполняемым командам\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       выключить автоматическую печать образца\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       выключить автоматическую печать образца\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             не использовать при выводе\n"
-"                                escape-последовательности языка C (по умолчанию)\n"
+"                                escape-последовательности языка C (по "
+"умолчанию)\n"
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                использовать на выводе отступы\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           сохранить заголовок как есть, не фильтровать его\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           сохранить заголовок как есть, не фильтровать "
+"его\n"
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:665
+#, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "фильтр вывода не завершается символом новой строки"
+
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s должен быть одиночным знаком пунктуации"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неверный порядок байт: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ульрих Дреппер"
 
-#: src/msgfmt.c:439
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "нельзя указывать входной файл, если задан %s или %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "для %s требуется указать «-d каталог»"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "для %s требуется указать «-l локаль»"
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "для %s требуется указать «--template шаблон»"
 
-#: src/msgfmt.c:545
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "для %s требуется указать «-o файл»"
 
-#: src/msgfmt.c:551
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s и %s взаимно исключают друг друга в %s"
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:626 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:571 src/msgfmt.c:577
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допустимо только с %s, %s или %s"
 
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "невозможно найти правила ITS для %s"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1698,7 +2073,7 @@ msgstr[0] "%d переведённое сообщение"
 msgstr[1] "%d переведённых сообщения"
 msgstr[2] "%d переведённых сообщений"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1706,7 +2081,7 @@ msgstr[0] ", %d неточный перевод"
 msgstr[1] ", %d неточных перевода"
 msgstr[2] ", %d неточных переводов"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1714,128 +2089,156 @@ msgstr[0] ", %d непереведённое сообщение"
 msgstr[1] ", %d непереведённых сообщения"
 msgstr[2] ", %d непереведённых сообщений"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Использование: %s [ПАРАМЕТР] имя-файла.po …\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Создаёт двоичный каталог сообщений из текстового описания переводов.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
-"То же и для необязательных аргументов.\n"
-
-#: src/msgfmt.c:790
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  имя-файл.po ...             входные файлы\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим работы:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  режим Java: создает Java-класс ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  режим Java: создает Java-класс ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 как --java, но предполагает Java2 (JDK 1.2 или выше)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 как --java, но предполагает Java2 (JDK 1.2 или "
+"выше)\n"
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                режим C#: генерировать .dll-файл .NET\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources    режим ресурсов C#: генерировать .resources-файл .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources    режим ресурсов C#: генерировать .resources-файл ."
+"NET\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   режим Tcl: создает .msg-файл для tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   режим Tcl: создает .msg-файл для tcl/msgcat\n"
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: генерировать .qm-файл Qt\n"
 
-#: src/msgfmt.c:811
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               режим Desktop Entry: генерировать файл ."
+"desktop\n"
+
+#: src/msgfmt.c:945
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               режим Desktop Entry: генерировать файл .desktop\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --xml                   режим XML: генерировать файл XML\n"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                строго соответствовать стандарту Uniforum\n"
+msgstr ""
+"      --strict                строго соответствовать стандарту Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
+msgstr ""
+"Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Нахождение выходного файла в режиме Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       имя ресурса\n"
 
-#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
-#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=ЛОКАЛЬ         имя локали, это либо язык, либо язык_СТРАНА\n"
 
-#: src/msgfmt.c:829
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                создавать файл .java, вместо файла .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                создавать файл .java, вместо файла .class\n"
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d КАТАЛОГ                  корневой каталог иерархии каталогов классов\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d КАТАЛОГ                  корневой каталог иерархии каталогов классов\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 "Имя класса определяется путём добавления имени локали к имени ресурса после\n"
-"символа подчеркивания. Параметр -d обязателен. Класс записывается в указанный\n"
+"символа подчеркивания. Параметр -d обязателен. Класс записывается в "
+"указанный\n"
 "каталог.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Нахождение выходного файла в режиме C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d КАТАТОГ                 базовый каталог для зависящих от локали .dll-файлов\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d КАТАТОГ                 базовый каталог для зависящих от локали .dll-"
+"файлов\n"
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1845,39 +2248,42 @@ msgstr ""
 "подкаталог указанного каталога, имя этого подкаталога зависит от\n"
 "локали.\n"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Нахождение входного файла в режиме Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d КАТАЛОГ                  корневой каталог иерархии .msg-файлов\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Параметры -l и -d обязательны. Выходной .msg-файл записывается в указанный каталог.\n"
+msgstr ""
+"Параметры -l и -d обязательны. Выходной .msg-файл записывается в указанный "
+"каталог.\n"
 
-#: src/msgfmt.c:861
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Параметры режима Desktop Entry:\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=ШАБЛОН           в качестве шаблона использовать файл .desktop\n"
+msgstr ""
+"  --template=ШАБЛОН           в качестве шаблона использовать файл .desktop\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d КАТАЛОГ                  корневой каталог файлов .po\n"
 
-#: src/msgfmt.c:871 src/xgettext.c:934
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -1886,179 +2292,209 @@ msgstr ""
 "  -k, --keyword[=СЛОВО]       дополнительное ключевое слово для поиска\n"
 "  -k, --keyword               не использовать ключевые слова по умолчанию\n"
 
-#: src/msgfmt.c:874
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Параметры -l, -o и --template обязательны. Если указан -D, то входные\n"
 "файлы читаются из каталога, а не берутся из аргументов командной строки.\n"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr "Параметры режима XML:\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr "  -L, --language=ИМЯ          указать язык XML\n"
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+"  --template=ШАБЛОН           в качестве шаблона использовать файл XML\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Интерпретация входного файла:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 произвести все проверки, подразумеваемые\n"
 "                              параметрами --check-format, --check-header,\n"
 "                              --check-domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          проверить зависящие от языка форматные строки\n"
+msgstr ""
+"      --check-format          проверить зависящие от языка форматные строки\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          проверить наличие и содержимое заголовка\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          проверить наличие и содержимое заголовка\n"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          проверить на конфликты между директивами домена\n"
+"      --check-domain          проверить на конфликты между директивами "
+"домена\n"
 "                                и параметром --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   проверить, что GNU msgfmt ведет себя так же, \n"
 "                                как X/Open msgfmt\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=СИМВОЛ]\n"
 "                              проверить наличие клавиатурных\n"
 "                              эквивалентов для пунктов меню\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             использовать при выводе неточные переводы\n"
+msgstr ""
+"  -f, --use-fuzzy             использовать при выводе неточные переводы\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=ЧИСЛО       выравнивать строки по ЧИСЛУ байт (по умолчанию: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=ЧИСЛО       выравнивать строки по ЧИСЛУ байт (по "
+"умолчанию: %d)\n"
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=П_БАЙТ     записывать 32-битные числа в заданном\n"
 "                              порядке байт (big или little, значение по\n"
 "                              умолчанию зависит от платформы)\n"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               двоичный файл не будет включать хэш-таблицу\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               двоичный файл не будет включать хэш-таблицу\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            напечатать статистику о переводах\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               увеличить подробность диагностических сообщений\n"
+msgstr ""
+"  -v, --verbose               увеличить подробность диагностических "
+"сообщений\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "предупреждение: заголовок PO-файла отсутствует или неправилен\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "предупреждение: преобразование кодировок не будет работать\n"
 
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "предупреждение: заголовок PO-файла помечен как неточный\n"
-
-#: src/msgfmt.c:1052
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "предупреждение: более старые версии msgfmt выдадут здесь ошибку\n"
-
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "имя домена «%s» не может быть использовано в качестве имени файла"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "имя домена «%s» недопустимо в качестве имени файла, будет использовано\n"
 "частично усеченное имя домена"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "директива «domain %s» игнорируется"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "пустая запись «msgstr» игнорируется"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "неточная запись «msgstr» игнорируется"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: исходный файл содержит неточные переводы"
 
-#: src/msgfmt.c:1323
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не существует"
 
-#: src/msgfmt.c:1334
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s существует, но недоступен для чтения"
 
-#: 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:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:163 src/x-python.c:176 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-vala.c:176
-#: src/x-ycp.c:91
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "ошибка чтения «%s»"
 
 #: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "параметр «%c» нельзя использовать до того, как заданы «J», «K», «T», «C» или «X»"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"параметр «%c» нельзя использовать до того, как заданы «J», «K», «T», «C» или "
+"«X»"
 
 #: src/msggrep.c:521
 #, c-format, no-wrap
@@ -2158,7 +2594,8 @@ msgstr ""
 
 #: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                использовать экранирующие последовательности,\n"
 "                                а не расширенные символы\n"
@@ -2173,17 +2610,23 @@ msgstr "      --sort-output           сортировать вывод\n"
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          сортировать вывод по именам файлов\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "В вашем окружении не определён предпочтительный язык.\n"
 "Установите переменную окружения LANG как описано в файле ABOUT-NLS. Это\n"
 "необходимо, чтобы вы могли проверить свои переводы.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2194,12 +2637,12 @@ msgstr ""
 "Укажите локаль с помощью параметра --locale или выходной\n"
 "po-файл с помощью параметра --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Создано %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2208,26 +2651,27 @@ msgstr ""
 "Создаёт новый PO-файл, инициализируя метаинформацию на основе\n"
 "пользовательского окружения.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХОДНОЙ-ФАЙЛ    входной POT-файл\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Если входной файл не задан, он ищется в текущем каталоге.\n"
 "Если входной файл задан как -, читается стандартный ввод.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записать вывод в указанный файл\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2237,17 +2681,21 @@ msgstr ""
 "установленной локали.  Если он задан как -, результаты выводятся на\n"
 "стандартный вывод.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=ЯЯ_СС          задает целевую локаль\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         предполагать, что PO-файл сгенерирован автоматически\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         предполагать, что PO-файл сгенерирован "
+"автоматически\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2255,12 +2703,12 @@ msgstr ""
 "Найдено более одного pot-файла.\n"
 "Укажите входной pot-файл с помощью параметра --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "ошибка при чтении текущего каталога"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2268,17 +2716,19 @@ msgstr ""
 "В текущем каталоге не найден pot-файл.\n"
 "Укажите входной pot-файл с помощью параметра --input.\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: 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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "дочерний процесс %s завершился аварийно с кодом выхода %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "В новом каталоге сообщений должен быть указан адрес вашей электронной\n"
@@ -2289,44 +2739,49 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Английские переводы для пакета %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "во входном файле две разные кодировки «%s» и «%s»"
 
 #: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "входной файл «%s» не содержит запись заголовка с описанием кодировки"
 
 #: 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 "домен «%s» во входном файле «%s» не содержит запись заголовка с описанием кодировки"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"домен «%s» во входном файле «%s» не содержит запись заголовка с описанием "
+"кодировки"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 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:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2335,18 +2790,20 @@ msgstr ""
 "Входные файлы содержат сообщения в разных кодировках, в том числе в\n"
 "UTF-8. Вывод преобразуется к UTF-8.\n"
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2356,10 +2813,11 @@ msgid ""
 msgstr ""
 "Преобразование файла %s из кодировки %s в кодировку %s\n"
 "изменяет некоторые msgid или msgctxt.\n"
-"Вы должно переписать все msgid и msgctxt в чистом ASCII либо убедиться, что они\n"
+"Вы должно переписать все msgid и msgctxt в чистом ASCII либо убедиться, что "
+"они\n"
 "изначально представлены в UTF-8, например в исходных файлах программы.\n"
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2371,12 +2829,12 @@ msgstr ""
 "Вывод «%s» может быть неправильным.\n"
 "Возможные методы обойти эту ситуацию:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Установить LC_ALL равной локали с кодировкой %s.\n"
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2387,7 +2845,7 @@ msgstr ""
 "  затем применить «%s»,\n"
 "  затем преобразовать обратно к %s с помощью «msgconv».\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2400,7 +2858,7 @@ msgstr ""
 "  затем применить «%s»,\n"
 "  затем преобразовать обратно к %s с помощью «msgconv».\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2411,58 +2869,64 @@ msgstr ""
 "Вывод «%s» может быть неправильным.\n"
 "Возможный метод обойти эту ситуацию — установить LC_ALL=C.\n"
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "выражение во множественном числе может давать отрицательные значения"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu, но выражение во множественном числе может давать значения до %lu"
+msgstr ""
+"nplurals = %lu, но выражение во множественном числе может давать значения до "
+"%lu"
 
-#: src/msgl-check.c:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "выражение во множественном числе может давать деление на ноль"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "выражение во множественном числе может дать переполнение целого"
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "выражение во множественном числе может давать исключительные ситуации в арифметике, возможно, деление на ноль"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"выражение во множественном числе может давать исключительные ситуации в "
+"арифметике, возможно, деление на ноль"
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Попробуйте следующее, подходит для %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "каталог сообщений содержит переводы во множественном числе"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "но в заголовке нет атрибута «plural=ВЫРАЖЕНИЕ»"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "но в заголовке нет атрибута «nplurals=ЦЕЛОЕ»"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "неверная значение nplurals"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "неверное выражение во множественном числе"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2470,7 +2934,7 @@ msgstr[0] "но в некоторых сообщениях только %lu фо
 msgstr[1] "но в некоторых сообщениях только %lu формы во множественном числе"
 msgstr[2] "но в некоторых сообщениях только %lu форм во множественном числе"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2478,60 +2942,86 @@ msgstr[0] "но в некоторых сообщениях есть %lu форм
 msgstr[1] "но в некоторых сообщениях есть %lu формы во множественном числе"
 msgstr[2] "но в некоторых сообщениях есть %lu форм во множественном числе"
 
-#: src/msgl-check.c:514
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "каталог сообщений содержит переводы во множественном числе, но в нем заголовка с «Plural-Forms: nplurals=ЦЕЛОЕ; plural=ВЫРАЖЕНИЕ;»"
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"каталог сообщений содержит переводы во множественном числе, но в нем "
+"заголовка с «Plural-Forms: nplurals=ЦЕЛОЕ; plural=ВЫРАЖЕНИЕ;»"
 
-#: src/msgl-check.c:611
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "поля «msgid» и «msgid_plural» не начинаются с «\\n»"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "поля «msgid» и «msgstr[%u]» не начинаются с «\\n»"
 
-#: src/msgl-check.c:634
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "поля «msgid» и «msgstr» не начинаются с «\\n»"
 
-#: src/msgl-check.c:652
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "поля «msgid» и «msgid_plural» не заканчиваются «\\n»"
 
-#: src/msgl-check.c:660
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "поля «msgid» и «msgstr[%u]» не заканчиваются «\\n»"
 
-#: src/msgl-check.c:675
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "поля «msgid» и «msgstr» не заканчиваются «\\n»"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "обработка форм во множественном числе является расширением GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "в msgstr недостает отметки клавиатурного эквивалента «%c»"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "в msgstr слишком много отметок клавиатурных эквивалентов «%c»"
 
-#: src/msgl-check.c:814
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
-msgstr "поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
+msgstr ""
+"поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
 
-#: src/msgl-check.c:831
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "в заголовке отсутствует поле «%s»\n"
 
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr "многоточие ASCII («…») вместо Unicode"
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr "обнаружен пробел перед многоточием в видимых пользователем строках"
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr "двойная кавычка ASCII вместо Unicode"
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr "одинарная кавычка ASCII вместо Unicode"
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "маркёр абзаца ASCII («%c») вместо Unicode"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2542,37 +3032,49 @@ msgstr "%s: неверные данные для кодировки «%s»"
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: ошибка при преобразовании из кодировки «%s» в кодировку «%s»"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "входной файл не содержит поле заголовка с описанием кодировки"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Невозможно преобразовать из «%s» в «%s». %s полагается на iconv(), но iconv() не поддерживает это преобразование."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Невозможно преобразовать из «%s» в «%s». %s полагается на iconv(), но "
+"iconv() не поддерживает это преобразование."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Преобразование из «%s» в «%s» порождает дубликаты: некоторые различающиеся оригиналы сообщений становятся одинаковыми."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Преобразование из «%s» в «%s» порождает дубликаты: некоторые различающиеся "
+"оригиналы сообщений становятся одинаковыми."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()."
+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:405 src/msgmerge.c:411
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s допустимо только с %s"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "тип резервного копирования"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2597,26 +3099,28 @@ msgstr ""
 "используется приблизительное сравнение, если нельзя найти точное\n"
 "совпадение.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      переводы, ссылающиеся на старые исходники\n"
+msgstr ""
+"  def.po                      переводы, ссылающиеся на старые исходники\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ссылки на новые исходники\n"
 
-#: src/msgmerge.c:526
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=ФАЙЛ       дополнительная библиотека переводов сообщений, \n"
+"  -C, --compendium=ФАЙЛ       дополнительная библиотека переводов "
+"сообщений, \n"
 "                              можно указывать несколько раз\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2625,30 +3129,32 @@ msgstr ""
 "  -U, --update                обновить def.po,\n"
 "                              ничего не делать, если def.po уже обновлен\n"
 
-#: src/msgmerge.c:544
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Нахождение выходного файла в режиме обновления:\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Результат записывается обратно в def.po.\n"
 
-#: src/msgmerge.c:548
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=МЕТОД          сделать резервную копию def.po\n"
 
-#: src/msgmerge.c:550
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=СУФФИКС        перекрыть обычный суффикс резервной копии\n"
+msgstr ""
+"      --suffix=СУФФИКС        перекрыть обычный суффикс резервной копии\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2657,51 +3163,65 @@ msgid ""
 msgstr ""
 "Метод управления версиями можно выбрать с помощью параметра --backup или\n"
 "через переменную среды VERSION_CONTROL. Вот допустимые значения:\n"
-"  none, off       не делать резервных копий (даже если задан параметр --backup)\n"
+"  none, off       не делать резервных копий (даже если задан параметр --"
+"backup)\n"
 "  numbered, t     делать нумерованные резервные копии\n"
 "  existing, nil   нумерованные, если такие уже есть, и простые, если нет\n"
 "  simple, never   всегда делать простые резервные копии\n"
 "\n"
 
-#: src/msgmerge.c:559
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "В качестве суффикса резервных копий используется «~», если не\n"
 "установлен иной с помощью параметра --suffix или переменной окружения\n"
 "SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:570
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 распознавать форматные строки Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              сохранить предыдущие msgid переведённых\n"
 "                              сообщений\n"
 
-#: src/msgmerge.c:627 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       не выводить индикатор хода выполнения\n"
 
-#: src/msgmerge.c:1622
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "данное сообщение должно определять формы во множественном числе"
 
-#: src/msgmerge.c:1645
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "данное сообщение не должно определять формы во множественном числе"
 
-#: src/msgmerge.c:2048
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sПрочитано сообщений: старых %ld + новых %ld; объединено %ld, помечено неточными %ld, недостающих %ld, недействительных %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sПрочитано сообщений: старых %ld + новых %ld; объединено %ld, помечено "
+"неточными %ld, недостающих %ld, недействительных %ld.\n"
 
-#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " завершено.\n"
@@ -2723,8 +3243,12 @@ msgstr "Преобразует двоичный каталог сообщени�
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  режим Java: на входе Java-класс ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  режим Java: на входе Java-класс "
+"ResourceBundle\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -2733,13 +3257,19 @@ msgstr "      --csharp                режим C#: на входе .dll-фай
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      режим ресурсов C#: на входе .resources-файл .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      режим ресурсов C#: на входе .resources-файл ."
+"NET\n"
 
 #: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   режим Tcl: на входе .msg-файл для tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
@@ -2754,7 +3284,8 @@ msgstr "Нахождение входного файла в режиме Java:\n
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Имя класса определяется путем добавления имени локали к имени ресурса после\n"
@@ -2784,7 +3315,9 @@ msgstr "Нахождение входного файла в режиме Tcl:\n"
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
-msgstr "Параметры -l и -d обязательны. Входной .msg-файл ищется в указанном каталоге.\n"
+msgstr ""
+"Параметры -l и -d обязательны. Входной .msg-файл ищется в указанном "
+"каталоге.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
@@ -2794,7 +3327,9 @@ msgstr "  -i, --indent                использовать на выводе
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                выводить в строгом соответствии стандарту Uniforum\n"
+msgstr ""
+"      --strict                выводить в строгом соответствии стандарту "
+"Uniforum\n"
 
 #: src/msguniq.c:331
 #, c-format, no-wrap
@@ -2826,8 +3361,12 @@ msgstr "  -d, --repeated              печатать только дублик
 
 #: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                печатать только уникальные, пропуская дубликаты\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                печатать только уникальные, пропуская "
+"дубликаты\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -2848,13 +3387,17 @@ msgstr ""
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
-msgstr "Кодировка «%s» не поддерживается. %s полагается на iconv(), но iconv() не поддерживает «%s».\n"
+msgstr ""
+"Кодировка «%s» не поддерживается. %s полагается на iconv(), но iconv() не "
+"поддерживает «%s».\n"
 
 #: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
-msgstr "Чтобы решить эту проблему, установите GNU libiconv и переустановите GNU gettext.\n"
+msgstr ""
+"Чтобы решить эту проблему, установите GNU libiconv и переустановите GNU "
+"gettext.\n"
 
 #: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
@@ -2881,32 +3424,32 @@ msgstr ""
 "В заголовке не указана кодировка.\n"
 "Преобразование сообщений к кодировке пользователя не сработает.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "непоследовательное применение #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "пропущена секция «msgstr[]»"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "пропущена секция «msgid_plural»"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "пропущена секция «msgstr»"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "первая форма множественного числа имеет ненулевой индекс"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "форма множественного числа имеет неправильный индекс"
@@ -2916,7 +3459,7 @@ msgstr "форма множественного числа имеет непра
 msgid "too many errors, aborting"
 msgstr "слишком много ошибок, завершение"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неверная многобайтовая последовательность"
@@ -2926,78 +3469,111 @@ msgstr "неверная многобайтовая последовательн
 msgid "incomplete multibyte sequence at end of file"
 msgstr "неполная многобайтовая последовательность в конце файла"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "неполная многобайтовая последовательность в конце строки"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "вызов iconv завершился неуспехом"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "неизвестное ключевое слово «%s»"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "неверная управляющая последовательность"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "символ конца файла встречен внутри строки"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "символ конца строки встречен внутри строки"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "разделитель контекста <EOT> внутри строки"
 
 # это сообщение пока не используется
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "этот файл не может содержать директивы домена"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "повторное определение сообщения"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "место появления первого определения"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr "незавершённое имя группы"
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr "неверный непробельный символ"
+
+#: src/read-desktop.c:405
+#, c-format
+msgid "missing '=' after \"%s\""
+msgstr "отсутствует «=» после «%s»"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "неверная непробельная строка"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл «%s» усечён"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл «%s» содержит строку, не завершённую нулем"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "файл «%s» содержит строку, не завершённую нулем"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файл «%s» не в соответствует формату GNU .mo"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл «%s» содержит строку, не завершённую нулем, в позиции %s"
 
-#: src/read-properties.c:227
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "предупреждение: неверный синтаксис \\uxxxx для символа Unicode"
 
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: предупреждение: одиночный заменитель U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "предупреждение: неверный символ Unicode"
+
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "предупреждение: незавершенная строка"
@@ -3010,15 +3586,16 @@ msgstr "предупреждение: синтаксическая ошибка"
 msgid "warning: unterminated key/value pair"
 msgstr "предупреждение: незавершенная пара ключ/значение"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr "предупреждение: синтаксическая ошибка, после строки ожидается «;»"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
+msgstr ""
+"предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Авторы программы — %s и %s.\n"
@@ -3027,16 +3604,16 @@ msgstr "Авторы программы — %s и %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Данило Шеган"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Перекодирует сербский текст из кириллицы в латиницу.\n"
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3045,27 +3622,27 @@ msgstr ""
 "Входной текст читается со стандартного ввода.  Преобразованный текст\n"
 "печатается на стандартный вывод.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "неверный вход для кодировки «%s»"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "ошибка при преобразовании из кодировки «%s» в кодировку «%s»"
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "ожидается два аргумента"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Использование: %s [ПАРАМЕТР] URL ФАЙЛ\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3074,99 +3651,125 @@ msgstr ""
 "Получает и выводит содержимое заданного URL.  Если к URL невозможно\n"
 "получить доступ, вместо него используется указанный локальный ФАЙЛ.\n"
 
-#: src/urlget.c:228
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "ошибка чтения «%s»"
 
-#: src/urlget.c:234
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "ошибка записи на стандартный вывод"
 
-#: src/urlget.c:238
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "ошибка после чтения «%s»"
 
-#: src/urlget.c:264
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Получение %s…"
 
-#: src/urlget.c:308
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " время ожидания истекло.\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " завершилась с ошибкой.\n"
 
-#: src/write-catalog.c:126
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Невозможно вывести несколько доменов перевода в единый файл указанного формата.  Попробуйте применить синтаксис PO-файлов."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Невозможно вывести несколько доменов перевода в единый файл указанного "
+"формата.  Попробуйте применить синтаксис PO-файлов."
 
-#: src/write-catalog.c:129
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Невозможно вывести несколько доменов перевода в единый файл указанного формата."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Невозможно вывести несколько доменов перевода в единый файл указанного "
+"формата."
 
-#: src/write-catalog.c:162
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "каталог сообщений содержит переводы с контекстом, но выходной формат их не поддерживает."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"каталог сообщений содержит переводы с контекстом, но выходной формат их не "
+"поддерживает."
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "каталог сообщений содержит переводы во множественном числе, но выходной формат не поддерживает их.  Попробуйте сгенерировать Java-класс с помощью «msgfmt --java», а не файл properties."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"каталог сообщений содержит переводы во множественном числе, но выходной "
+"формат не поддерживает их.  Попробуйте сгенерировать Java-класс с помощью "
+"«msgfmt --java», а не файл properties."
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "каталог сообщений содержит переводы во множественном числе, но выходной формат их не поддерживает."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"каталог сообщений содержит переводы во множественном числе, но выходной "
+"формат их не поддерживает."
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "невозможно создать файл вывода «%s»"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "стандартный вывод"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не удалось создать каталог «%s»"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "компиляция C#-класса завершилась неуспехом, попробуйте --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "компиляция класса C# завершилась с ошибкой"
 
-#: src/write-java.c:1091
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "ошибка открытия «%s» для записи"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "%s не является верным именем класса Java"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "компиляция класса Java завершилась с ошибкой, попробуйте --verbose или установите $JAVAC"
+msgstr ""
+"компиляция класса Java завершилась с ошибкой, попробуйте --verbose или "
+"установите $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
-
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "ошибка открытия «%s» для записи"
+msgstr ""
+"компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
 
 #: src/write-po.c:821
 msgid "incomplete multibyte sequence"
@@ -3174,10 +3777,13 @@ msgstr "неполная многобайтовая последовательн
 
 #: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "переводимые сообщения не должны содержать экранирующую последовательность «\\%c»"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"переводимые сообщения не должны содержать экранирующую последовательность «\\"
+"%c»"
 
-#: src/write-po.c:1335 src/write-po.c:1459
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3190,7 +3796,7 @@ msgstr ""
 "кодировку, что и вы. Подумайте об использовании в msgctxt только ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1347 src/write-po.c:1471
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3203,7 +3809,7 @@ msgstr ""
 "кодировку, что и вы. Подумайте об использовании в msgid только ASCII.\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3212,9 +3818,10 @@ msgstr ""
 "каталогов сообщений Qt не поддерживает обработку множественного\n"
 "числа\n"
 
-#: src/write-qt.c:693
+#: src/write-qt.c:694
 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 ""
@@ -3222,7 +3829,7 @@ msgstr ""
 "но формат каталога сообщений Qt поддерживает Unicode только в\n"
 "переведенных строках, но не в контекстах\n"
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3232,12 +3839,12 @@ msgstr ""
 "но формат каталога сообщений Qt поддерживает Unicode только в\n"
 "переведенных строках, но не в оригиналах\n"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "ошибка при записи в дочерний процесс %s"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3245,7 +3852,7 @@ msgstr ""
 "каталог сообщений содержит переводы с контекстом, но формат\n"
 ".resources C# не поддерживает контексты\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3253,7 +3860,7 @@ msgstr ""
 "каталог сообщений содержит переводы во множественном числе, но формат\n"
 ".resources C# не поддерживает обработку множественного числа\n"
 
-#: src/write-tcl.c:157
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3261,7 +3868,7 @@ msgstr ""
 "каталог сообщений содержит переводы с контекстом, но формат\n"
 "каталогов сообщений для Tcl не поддерживает контексты\n"
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3270,32 +3877,52 @@ msgstr ""
 "каталогов сообщений для Tcl не поддерживает обработку множественного\n"
 "числа\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: предупреждение: незавершенная строка"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: предупреждение: незавершенное регулярное выражение"
 
-#: src/x-c.c:1052
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "предупреждение: неверный символ Unicode"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: предупреждение: неверный символ Unicode"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: предупреждение: незавершенная строка"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: предупреждение: незавершенная строка"
 
-#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: предупреждение: незавершенная строка"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: предупреждение: незавершенная символьная константа"
 
-#: src/x-c.c:1348 src/x-vala.c:755
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавершенная строка"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Укажите входную кодировку с помощью параметра --from-code."
 
@@ -3335,7 +3962,7 @@ msgstr ""
 "%s:%d: Неполная многобайтовая последовательность в конце строки.\n"
 "Укажите входную кодировку с помощью параметра --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: вызов iconv завершился с ошибкой"
@@ -3349,56 +3976,410 @@ msgstr ""
 "%s:%d: Неверная многобайтовая последовательность.\n"
 "Укажите входную кодировку с помощью параметра --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: предупреждение: неверный символ Unicode"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: предупреждение: незавершенная строковая константа"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: предупреждение: встречена «)», где ожидается «}»"
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: предупреждение: встречена «}», где ожидается «)»"
 
-#: src/x-glade.c:295
+#: src/xgettext.c:567
+#, c-format
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr "«%s» не является корректным именем кодировки. Используется ASCII.\n"
+
+#: src/xgettext.c:637
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "Отсутствует контекст для строки, извлечённой из элемента «%s»"
+msgid "syntax check '%s' unknown"
+msgstr "неизвестная синтаксическая проверка «%s»"
 
-#: src/x-glade.c:417
+#: src/xgettext.c:646
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "Корневой элемент <%s> недопустим в корректном файле Glade"
+msgid "sentence end type '%s' unknown"
+msgstr "неизвестный тип конца оператора «%s»"
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/xgettext.c:701
 #, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr ""
+"параметр --join-existing не может быть использован при записи в стандартный "
+"вывод"
 
-#: src/x-glade.c:606
+#: src/xgettext.c:705
+#, c-format
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext не может работать, не зная искомых ключевых слов"
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr "предупреждение: файл правил ITS %s не существует"
+
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"Язык «glade» не поддерживается. %s полагается на expat.\n"
-"Эта версия собрана без expat.\n"
+"предупреждение: файл правил ITS %s не существует; проверьте правильность "
+"установки gettext"
 
-#: src/x-java.c:494
+#: src/xgettext.c:938
 #, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: предупреждение: одиночный заменитель U+%04X"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgstr ""
+"предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
+
+#: src/xgettext.c:1027
+#, c-format
+msgid "Extract translatable strings from given input files.\n"
+msgstr "Извлекает переводимые строки из указанных входных файлов.\n"
+
+#: src/xgettext.c:1050
+#, 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:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr "  -o, --output=ФАЙЛ           записать вывод в указанный файл\n"
 
-#: src/x-javascript.c:230
+#: src/xgettext.c:1054
+#, c-format
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr "  -p, --output-dir=КАТ        поместить выходные файлы в каталог КАТ\n"
+
+#: src/xgettext.c:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "Выбор языка входного файла:\n"
+
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=ИМЯ          распознавать указанный язык\n"
+"                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                              EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                              GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                              JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++                   синоним --language=C++\n"
+
+#: src/xgettext.c:1070
+#, c-format
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr "По умолчанию язык определяется по расширению входного файла.\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
+msgstr ""
+"      --from-code=ИМЯ            кодировка входных файлов\n"
+"                                   (кроме Python, Tcl, Glade)\n"
+
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr "По умолчанию считается, что входные файлы содержат только ASCII.\n"
+
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr "  -j, --join-existing         слить сообщения с существующим файлом\n"
+
+#: src/xgettext.c:1085
+#, 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:1087
+#, c-format
+msgid ""
+"  -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"
+"  -c, --add-comments          записать все блоки комментариев, начиная с\n"
+"                              предшествующих ключевых строк в выходной файл\n"
+
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+"      --check=NAME            выполнить синтаксическую проверку сообщений\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+"      --sentence-end=ТИП      тип, описывающий конец оператора\n"
+"                                (по умолчанию одиночный пробел,\n"
+"                                возможен двойной пробел)\n"
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Параметры для конкретных языков:\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           извлечь все строки\n"
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (только языки C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (только языки C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=СЛОВО:АРГ:ФЛАГ   дополнительный флаг для строк внутри "
+"аргумента\n"
+"                              номер АРГ ключевого слова СЛОВО\n"
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (только языки C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr "  -T, --trigraphs             понимать на входе триграфы ANSI C\n"
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (только языки C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=ФАЙЛ              применить правила ITS из ФАЙЛА\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (только для языков на основе XML)\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    распознавать форматные строки Qt\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (только язык C++)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   распознавать форматные строки KDE 4\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 распознавать форматные строки Boost\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 более подробный результат разбора форматной "
+"строки\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     записать .properties-файл Java\n"
+
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --itstool               выводить комментарии itstool\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr ""
+"      --copyright-holder=СТРОКА\n"
+"                      задает наименование обладателя авторских прав\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          не выводить уведомление об авторских правах "
+"FSF\n"
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=ПАКЕТ    задать имя пакета для вывода\n"
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --package-version=ВЕРСИЯ\n"
+"                              задать версию пакета для вывода\n"
+
+#: src/xgettext.c:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=АДРЕС@ЭЛЕКТРОННОЙ.ПОЧТЫ\n"
+"                      задает адрес, куда следует отправлять отчет об "
+"ошибках\n"
+
+#: src/xgettext.c:1198
+#, c-format
+msgid ""
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -m[СТРОКА], --msgstr-prefix[=СТРОКА]\n"
+"                              использовать СТРОКУ или «» как префикс\n"
+"                              к значениям msgstr\n"
+
+#: src/xgettext.c:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[СТРОКА], --msgstr-suffix[=СТРОКА]\n"
+"                              использовать СТРОКУ или «» как суффикс\n"
+"                              к значениям msgstr\n"
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr ""
+"Аргумент --flag не соответствует синтаксису <ключевое-слово>:<номер-арг>:"
+"[pass-]<флаг>: %s"
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "стандартный ввод"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"Не задан параметр --msgid-bugs-address. Если вы используете файл\n"
+"«Makevars», установите в нём переменную MSGID_BUGS_ADDRESS, в\n"
+"противном случае задайте в командной строке параметр --msgid-bugs-address.\n"
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "язык «%s» неизвестен"
+
+#: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Укажите входную кодировку с помощью параметра --from-code\n"
 
@@ -3447,526 +4428,460 @@ msgstr ""
 "%s:%d: Неверная многобайтовая последовательность.\n"
 "Укажите входную кодировку с помощью параметра --from-code\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: предупреждение: литерал RegExp завершился слишком рано"
 
-#: src/x-javascript.c:1055
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: предупреждение: %s не допускается"
 
-#: src/x-javascript.c:1069
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: предупреждение: незавершенная разметка XML"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: не удалось найти ограничитель строки «%s» вплоть до конца файла"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: пропущена закрывающая фигурная скобка в \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неверная интерполяция («\\l») восьмибитного символа «%c»"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неверная интерполяция («\\u») восьмибитного символа «%c»"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неверная интерполяция переменной в «%c»"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неверная интерполяция («\\L») восьмибитного символа «%c»"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неверная интерполяция («\\U») восьмибитного символа «%c»"
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неверная многобайтовая последовательность.\n"
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Длинная неполная многобайтовая последовательность.\n"
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неполная многобайтовая последовательность в конце файла.\n"
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неполная многобайтовая последовательность в конце строки.\n"
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неверная многобайтовая последовательность.\n"
 "Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
 "комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Кодировка «%s» неизвестна. Вместо неё используем ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неверное определение строки"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: пропущено число после #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неверное строковое выражение"
 
-#: src/x-sh.c:1074
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: предупреждение: синтаксис $\"...\" запрещен по соображениям безопасности; используйте eval_gettext"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: неверное определение строки"
 
-#: src/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: неверное определение строки"
 
-#: src/xgettext.c:545
+#: src/x-rst.c:691
 #, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "«%s» не является корректным именем кодировки. Используется ASCII.\n"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/xgettext.c:648
+#: src/x-sh.c:1101
 #, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "параметр --join-existing не может быть использован при записи в стандартный вывод"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: предупреждение: синтаксис $\"...\" запрещен по соображениям "
+"безопасности; используйте eval_gettext"
 
-#: src/xgettext.c:653
+#: src/x-vala.c:616
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext не может работать, не зная искомых ключевых слов"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr ""
+"%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
 
-#: src/xgettext.c:808
-#, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<без имени>"
 
-#: src/xgettext.c:859
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "Извлекает переводимые строки из указанных входных файлов.\n"
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "неверная последовательность UTF-8"
 
-#: src/xgettext.c:882
+#: libgettextpo/markup.c:377
 #, 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"
+msgid "'%s' is not a valid name: %c"
+msgstr "«%s» не является верным именем: %c"
 
-#: src/xgettext.c:884
+#: libgettextpo/markup.c:397
 #, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ФАЙЛ           записать вывод в указанный файл\n"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "«%s» не является верным именем: «%c»"
 
-#: src/xgettext.c:886
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=КАТ        поместить выходные файлы в каталог КАТ\n"
+msgid "invalid character reference: %s"
+msgstr "неверная символьная ссылка: %s"
 
-#: src/xgettext.c:891
-#, c-format
-msgid "Choice of input file language:\n"
-msgstr "Выбор языка входного файла:\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr "недопустимый номер спецификации"
 
-#: src/xgettext.c:893
-#, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
-msgstr ""
-"  -L, --language=ИМЯ          распознавать указанный язык\n"
-"                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                              EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                              GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                              JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr "не завершается «;»"
 
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   синоним --language=C++\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr "недопустимый символ"
 
-#: src/xgettext.c:902
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "По умолчанию язык определяется по расширению входного файла.\n"
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr "пусто"
 
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-"      --from-code=ИМЯ            кодировка входных файлов\n"
-"                                   (кроме Python, Tcl, Glade)\n"
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr "неизвестно"
 
-#: src/xgettext.c:910
+#: libgettextpo/markup.c:608
 #, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "По умолчанию считается, что входные файлы содержат только ASCII.\n"
+msgid "invalid entity reference: %s"
+msgstr "неверная объектная ссылка: %s"
 
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         слить сообщения с существующим файлом\n"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr "документ должен начинаться с элемента"
 
-#: src/xgettext.c:917
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
 #, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=ФАЙЛ.po  не извлекать вхождения из ФАЙЛА.po\n"
+msgid "invalid character after '%s'"
+msgstr "недопустимый символ после «%s»"
 
-#: src/xgettext.c:919
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid ""
-"  -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"
-"  -c, --add-comments          записать все блоки комментариев, начиная с\n"
-"                              предшествующих ключевых строк в выходной файл\n"
+msgid "missing '%c'"
+msgstr "отсутствует «%c»"
 
-#: src/xgettext.c:925
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid "Language specific options:\n"
-msgstr "Параметры для конкретных языков:\n"
+msgid "missing '%c' or '%c'"
+msgstr "отсутствует «%c» или «%c»"
 
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           извлечь все строки\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr "имя закрывающего элемента"
 
-#: src/xgettext.c:929
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr "элемент закрыт"
 
-#: src/xgettext.c:937
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
-msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala, Desktop)\n"
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr "пустой документ"
 
-#: src/xgettext.c:942
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
-msgstr ""
-"      --flag=СЛОВО:АРГ:ФЛАГ   дополнительный флаг для строк внутри аргумента\n"
-"                              номер АРГ ключевого слова СЛОВО\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr "после «<»"
 
-#: src/xgettext.c:945
-#, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (только языки C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr "элемент всё ещё открыт"
 
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             понимать на входе триграфы ANSI C\n"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr "отсутствует «>»"
 
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (только языки C, C++, ObjectiveC)\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr "внутри имени элемента"
 
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    распознавать форматные строки Qt\n"
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "внутри имени атрибута"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (только язык C++)\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr "внутри открывающего тега"
 
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                   распознавать форматные строки KDE 4\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr "после «=»"
 
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 распознавать форматные строки Boost\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr "внутри значения атрибута"
 
-#: src/xgettext.c:966
-#, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 более подробный результат разбора форматной строки\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr "внутри закрывающего тега"
 
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     записать .properties-файл Java\n"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr "внутри комментария или инструкции обработки"
 
-#: src/xgettext.c:1006
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=СТРОКА\n"
-"                      задает наименование обладателя авторских прав\n"
+msgid "document ended unexpectedly: %s"
+msgstr "документ закончился неожиданно: %s"
 
-#: src/xgettext.c:1008
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          не выводить уведомление об авторских правах FSF\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: у параметра «--%s» не может быть аргумента\n"
 
-#: src/xgettext.c:1010
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=ПАКЕТ    задать имя пакета для вывода\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: неизвестный параметр «--%s»\n"
 
-#: src/xgettext.c:1012
 #, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --package-version=ВЕРСИЯ\n"
-"                              задать версию пакета для вывода\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: двусмысленный параметр «-W %s»\n"
 
-#: src/xgettext.c:1014
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-"      --msgid-bugs-address=АДРЕС@ЭЛЕКТРОННОЙ.ПОЧТЫ\n"
-"                      задает адрес, куда следует отправлять отчет об ошибках\n"
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
 
-#: src/xgettext.c:1016
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -m[СТРОКА], --msgstr-prefix[=СТРОКА]\n"
-"                              использовать СТРОКУ или «» как префикс\n"
-"                              к значениям msgstr\n"
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: для параметра «-W %s» требуется аргумент\n"
 
-#: src/xgettext.c:1019
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr ""
-"  -M[СТРОКА], --msgstr-suffix[=СТРОКА]\n"
-"                              использовать СТРОКУ или «» как суффикс\n"
-"                              к значениям msgstr\n"
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "предупреждение: заголовок PO-файла помечен как неточный\n"
 
-#: src/xgettext.c:1840
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Аргумент --flag не соответствует синтаксису <ключевое-слово>:<номер-арг>:[pass-]<флаг>: %s"
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "предупреждение: более старые версии msgfmt выдадут здесь ошибку\n"
 
-#: src/xgettext.c:1965
-msgid "standard input"
-msgstr "стандартный ввод"
-
-#: src/xgettext.c:2071
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Не ASCII-символ у %s%s."
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Не ASCII-символ у %s%s."
 
-#: src/xgettext.c:2075
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Не ASCII-комментарий у или перед %s%s."
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Не ASCII-комментарий у или перед %s%s."
 
-#: src/xgettext.c:2080
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Не ASCII-строка у %s%s."
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Не ASCII-строка у %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: предупреждение: "
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: предупреждение: "
 
-#: src/xgettext.c:2189
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Несмотря на использование в месте, где предполагается форматная строка, %s не является верной форматной строкой %s. Причина: %s\n"
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Несмотря на использование в месте, где предполагается форматная строка, "
+#~ "%s не является верной форматной строкой %s. Причина: %s\n"
 
-#: src/xgettext.c:2190
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Строка %s не является верной форматной строкой %s, хотя и объявлена как таковая. Причина: %s\n"
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Строка %s не является верной форматной строкой %s, хотя и объявлена как "
+#~ "таковая. Причина: %s\n"
 
-#: src/xgettext.c:2221
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"Форматная строка «%s» с безымянными аргументами не может быть\n"
-"правильно локализована: переводчик не может поменять местами\n"
-"аргументы.\n"
-"Используйте форматную строку с именованными аргументами и\n"
-"отображение вместо кортежа для аргументов.\n"
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Форматная строка «%s» с безымянными аргументами не может быть\n"
+#~ "правильно локализована: переводчик не может поменять местами\n"
+#~ "аргументы.\n"
+#~ "Используйте форматную строку с именованными аргументами и\n"
+#~ "отображение вместо кортежа для аргументов.\n"
 
-#: src/xgettext.c:2283
-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 ""
-"Пустой msgid. Он зарезервирован для GNU gettext:\n"
-"gettext(\"\") возвращает текст заголовка с метаинформацией,\n"
-"а не пустую строку.\n"
+#~ 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 ""
+#~ "Пустой msgid. Он зарезервирован для GNU gettext:\n"
+#~ "gettext(\"\") возвращает текст заголовка с метаинформацией,\n"
+#~ "а не пустую строку.\n"
 
-#: src/xgettext.c:2979
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "неоднозначная спецификация аргумента для ключевого слова «%.*s»"
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "неоднозначная спецификация аргумента для ключевого слова «%.*s»"
 
-#: src/xgettext.c:3006
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "предупреждение: не указан контекст для ключевого слова «%.*s»"
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "предупреждение: не указан контекст для ключевого слова «%.*s»"
 
-#: src/xgettext.c:3031
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "предупреждение: не указан контекст для аргумента во множественном числе у ключевого слова «%.*s»"
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "предупреждение: не указан контекст для аргумента во множественном числе у "
+#~ "ключевого слова «%.*s»"
 
-#: src/xgettext.c:3052
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "не совпадают контексты у форм в единственном и множественном числе"
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "не совпадают контексты у форм в единственном и множественном числе"
 
-#: src/xgettext.c:3419
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"Не задан параметр --msgid-bugs-address. Если вы используете файл\n"
-"«Makevars», установите в нём переменную MSGID_BUGS_ADDRESS, в\n"
-"противном случае задайте в командной строке параметр --msgid-bugs-address.\n"
+#~ msgid "Missing context for the string extracted from '%s' element"
+#~ msgstr "Отсутствует контекст для строки, извлечённой из элемента «%s»"
 
-#: src/xgettext.c:3638
-#, c-format
-msgid "language '%s' unknown"
-msgstr "язык «%s» неизвестен"
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
 
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<без имени>"
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Язык «glade» не поддерживается. %s полагается на expat.\n"
+#~ "Эта версия собрана без expat.\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: недопустимый ключ -- %c\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "операция DuplicateHandle завершилась неуспехом с выходным кодом 0x%08x"
+#~ msgstr ""
+#~ "операция DuplicateHandle завершилась неуспехом с выходным кодом 0x%08x"
 
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Множественные ссылки на %%%c."
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Это свободная программа; подробности об условиях распространения смотрите\n"
+#~ "Это свободная программа; подробности об условиях распространения "
+#~ "смотрите\n"
 #~ "в исходном тексте.  Мы НЕ предоставляем гарантий; даже гарантий\n"
 #~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
 
@@ -3977,7 +4892,8 @@ msgstr "<без имени>"
 #~ msgstr "поле заголовка `%s' должно начинаться с новой строки\n"
 
 #~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле заголовка `%s' все еще имеет первоначальное шаблонное значение\n"
+#~ msgstr ""
+#~ "поле заголовка `%s' все еще имеет первоначальное шаблонное значение\n"
 
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index 3100d3ac6..7ea081ea2 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -8,27 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
-"PO-Revision-Date: 2016-06-02 06:44+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-12-14 00:44+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "neplatný parameter %s pre %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "nejednoznačný parameter %s pre %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
@@ -56,201 +57,185 @@ msgstr "nemožno odstrániť dočasný adresár %s"
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "zachovanie oprávnení pre %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "chyba pri otváraní %s na čítanie"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, 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:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "chyba pri čítaní %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "chyba pri zápise %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() zlyhalo"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Kompilátor C# nebol nájdený. Skúste nainštalovať pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces zlyhal"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: voľba '%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: voľba '%s' nie je jednoznačná; možnosti:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neznáma voľba '%c%s'\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: voľba '%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: voľba '--%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neznáma voľba '--%s'\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neznáma voľba '%c%s'\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, 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:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "neplatný parameter source_version pre compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neplatný parameter target_version pre compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba počas zápisu do súboru \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Kompilátor Javy nebol nájdený. Skúste nainštalovať gcj alebo nastavte $JAVAC"
+msgstr ""
+"Kompilátor Javy nebol nájdený. Skúste nainštalovať gcj alebo nastavte $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte $JAVA"
+msgstr ""
+"Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
-msgstr "pamäť je vyčerpaná"
+msgstr "vyčerpaná pamäť"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "vytváranie vláken zlyhalo"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zápis do podprocesu %s zlyhal"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "čítanie z podprocesu %s zlyhalo"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nemožno nastaviž neblokujúce V/V do podprocesu %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikácia s podprocesom %s zlyhala"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s skončil s ukončovacím kódom %d"
@@ -274,13 +259,13 @@ msgstr "podproces %s skončil s ukončovacím kódom %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "“"
 
@@ -289,64 +274,69 @@ msgstr "“"
 msgid "setting permissions for %s"
 msgstr "nastavovanie oprávnení pre %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "nemožno vytvoriť rúru"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "zlyhalo _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nemožno obnoviť fd %d: zlyhalo dup2"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s podproces"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podproces dostal kritický signál %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "koreňový element musí byť <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Element <%s> neobsahuje element <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Element <%s> nemá vlastnosť <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Použitie: %s [VOĽBA...] [N_PROSTREDIE PRAVIDLÁ]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -362,7 +352,7 @@ msgstr ""
 "pre gettext. Ak nie sú zadané žiadne parametre, načíta CLDR pravidlá\n"
 "množného čísla zo štandardného vstupu.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -371,27 +361,29 @@ msgstr ""
 "Povinné parametre dlhých volieb sú povinné aj pre krátke voľby.\n"
 "Podobne aj pre voliteľné parametre.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  vypísať pravidlá pre množné číslo vo formáte CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  vypísať pravidlá pre množné číslo vo formáte "
+"CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, 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/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, 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"
@@ -400,106 +392,114 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 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 anglicky).\n"
-"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux.sk>.\n"
-
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+"Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
+"anglicky).\n"
+"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux."
+"sk>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Autorské práva (C) %s Free Software Foundation, Inc.\n"
+"Autorské práva © %s Free Software Foundation, Inc.\n"
 "Licencia GPLv3+: GNU GPL verzia 3 alebo novšia <http://gnu.org/licenses/gpl.html>\n"
 "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/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s nemožno prečítať"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "nemožno extrahovať pravidlá pre %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "nemožno analyzovať pravidlo CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "operand %s navyše"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter %u v '%s' nie je v '%s'"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "formátovacia značka pre parameter %u nie je v '%s'"
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "formátovacie značky v '%s' a '%s' pre parameter %u nie sú rovnaké"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktíva číslo %u začína znakom |, ale nekončí znakom |."
@@ -507,58 +507,69 @@ msgstr "Direktíva číslo %u začína znakom |, ale nekončí znakom |."
 #: src/format.c:152
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "'%s' nie je platný formátovací reťazec %s, na rozdiel od '%s'. Dôvod: %s"
+msgstr ""
+"'%s' nie je platný formátovací reťazec %s, na rozdiel od '%s'. Dôvod: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "V direktíve číslo %u, token za '<' nie je názov makra špecifikujúceho formát. Platné názvy makier sú uvedené v ISO C 99 kapitola 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"V direktíve číslo %u, token za '<' nie je názov makra špecifikujúceho "
+"formát. Platné názvy makier sú uvedené v ISO C 99 kapitola 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktíve číslo %u, token za '<' nie je nasledovaný znakom '>'."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parameter číslo %u."
+msgstr ""
+"Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parameter číslo %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "počet formátovacích značiek v '%s' a '%s' sa nezhoduje"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "V direktíve číslo %u, '{' nie je nasledované číslom parametra."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "V direktíve číslo %u, ',' nie je nasledované číslom."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Reťazec končí v strede direktívy: nájdené '{' bez zodpovedajúceho '}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Direktíva číslo %u končí neplatným znakom '%c' namiesto '}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Direktíva číslo %u končí neplatným znakom namiesto '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Reťazec začína v strede direktívy: nájdené '}' bez zodpovedajúceho '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Reťazec začína v strede direktívy: nájdené '}' bez zodpovedajúceho '{'."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Reťazec obsahuje osamotené '}' po direktíve číslo %u."
@@ -575,12 +586,16 @@ msgstr "V direktíve číslo %u nie je povolená presnosť pred '%c'."
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "V direktíve číslo %u sa musí číslo parametra pre presnosť rovnať %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "V direktíve číslo %u nie je povolené špecifikovať presnosť pred '%c'."
 
 #: src/format-gcc-internal.c:406
@@ -618,93 +633,128 @@ msgid "The string ends in the middle of a directive."
 msgstr "Reťazec končí v strede direktívy."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Reťazec sa odkazuje na parametre cez absolútne čísla parametrov aj cez nečíslované špecifikácie parametrov."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Reťazec sa odkazuje na parametre cez absolútne čísla parametrov aj cez "
+"nečíslované špecifikácie parametrov."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "V direktíve číslo %u, parameter číslo 0 nie je kladné číslo."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "V direktíve číslo %u, parameter šírky číslo 0 nie je kladné číslo."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "V direktíve číslo %u, parameter presnosti číslo 0 nie je kladné číslo."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "V direktíve číslo %u, znak '%c' nie je platný špecifikátor konverzie."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je platný špecifikátor konverzie."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Znak, ktorý ukončuje direktívu číslo %u nie je platný špecifikátor konverzie."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Reťazec sa odkazuje na číslo parametra %u nekompatibilnými spôsobmi."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "V direktíve číslo %u, podreťazec \"%s\" nie je platný typ dátumu a času."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"V direktíve číslo %u, podreťazec \"%s\" nie je platný typ dátumu a času."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "V direktíve číslo %u, \"%s\" nie je nasledované čiarkou."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "V direktíve číslo %u, podreťazec \"%s\" nie je platný typ čísla."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "V direktíve číslo %u, číslo parametra nie je nasledované čiarkou a jedným z \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"V direktíve číslo %u, číslo parametra nie je nasledované čiarkou a jedným z "
+"\"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "V direktíve číslo %u, voľba neobsahuje číslo."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "V direktíve číslo %u, voľba obsahuje číslo, ktoré nie je nasledované '<', '#' alebo '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"V direktíve číslo %u, voľba obsahuje číslo, ktoré nie je nasledované '<', "
+"'#' alebo '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter {%u} v '%s' nie je v '%s'"
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter {%u} neexistuje v '%s'"
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' 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átovacie značky v '%s' a '%s' pre parameter {%u} nie sú rovnaké"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parametre číslo %u a %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parametre číslo %u a "
+"%u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "formátovacia značka pre parametre %u a %u nie je v '%s'; môže byť ignorovaný iba jeden parameter"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"formátovacia značka pre parametre %u a %u nie je v '%s'; môže byť ignorovaný "
+"iba jeden parameter"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -715,16 +765,30 @@ msgstr "chyba pri analýze: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "V direktíve číslo %u, parameter %u je typu '%s' ale parameter typu '%s' je očakávaný."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"V direktíve číslo %u, parameter %u je typu '%s' ale parameter typu '%s' je "
+"očakávaný."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávaných najviac %u parametrov."
-msgstr[1] "V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávaný najviac %u parameter."
-msgstr[2] "V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávané najviac %u parametre."
+msgid ""
+"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."
+msgstr[0] ""
+"V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávaných "
+"najviac %u parametrov."
+msgstr[1] ""
+"V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávaný najviac "
+"%u parameter."
+msgstr[2] ""
+"V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávané najviac "
+"%u parametre."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -754,8 +818,12 @@ msgstr "V direktíve číslo %u, obidva modifikátory @ a : sú zadané."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "V direktíve číslo %u, '~:[' nie je nasledované dvoma klauzulami oddelenými '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"V direktíve číslo %u, '~:[' nie je nasledované dvoma klauzulami oddelenými "
+"'~;'."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -777,15 +845,19 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formátovacie značky v '%s' nie sú podmnožinou značiek z '%s'"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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 "formátovacia značka pre parameter '%s' nie je v '%s'"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "V direktíve číslo %u, určenie veľkosti nie je kompatibilné so zadanou konverziou '%c'."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"V direktíve číslo %u, určenie veľkosti nie je kompatibilné so zadanou "
+"konverziou '%c'."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -804,8 +876,10 @@ msgstr "V direktíve číslo %u, '%c' nemôže byť na začiatku parametra getit
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "V direktíve číslo %u nie je povolené ďalšie vnorenie v špecifikácii formátu."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"V direktíve číslo %u nie je povolené ďalšie vnorenie v špecifikácii formátu."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -813,122 +887,155 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "V direktíve číslo %u je neukončená formátovacia direktíva."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Reťazec sa odkazuje na parameter cez meno parametra aj cez nepomenované špecifikácie parametra."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Reťazec sa odkazuje na parameter cez meno parametra aj cez nepomenované "
+"špecifikácie parametra."
 
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Reťazec sa odkazuje na argument pomenovaný '%s' nekompatibilnými spôsobmi."
+msgstr ""
+"Reťazec sa odkazuje na argument pomenovaný '%s' nekompatibilnými spôsobmi."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "formátovacie značky v '%s' predpokladajú mapovanie, ale značky v '%s' predpokladajú tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"formátovacie značky v '%s' predpokladajú mapovanie, ale značky v '%s' "
+"predpokladajú tuple"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "formátovacie značky v '%s' predpokladajú tuple, ale značky v '%s' predpokladajú mapovanie"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"formátovacie značky v '%s' predpokladajú tuple, ale značky v '%s' "
+"predpokladajú mapovanie"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter '%s' v '%s' nie je v '%s'"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formátovacie značky v '%s' a '%s' pre parameter '%s' nie sú rovnaké"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' je reťazec s jednoduchým formátom, ale '%s' nie je: obsahuje príznak 'L' alebo dvojmiestne číslo parametra"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' je reťazec s jednoduchým formátom, ale '%s' nie je: obsahuje príznak "
+"'L' alebo dvojmiestne číslo parametra"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Reťazec sa odkazuje na premennú prostredia s názvom, ktorý obsahuje aj nie ASCII znaky."
+msgstr ""
+"Reťazec sa odkazuje na premennú prostredia s názvom, ktorý obsahuje aj nie "
+"ASCII znaky."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Reťazec sa odkazuje na premennú prostredia s komplexnou syntaxou zátvoriek. Táto syntax je tu nepodporovaná z bezpečnostných dôvodov."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Reťazec sa odkazuje na premennú prostredia s komplexnou syntaxou zátvoriek. "
+"Táto syntax je tu nepodporovaná z bezpečnostných dôvodov."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Reťazec sa odkazuje na premennú prostredia, ktorej hodnota môže byť rozdielna vo vnútri funkcií shellu."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Reťazec sa odkazuje na premennú prostredia, ktorej hodnota môže byť "
+"rozdielna vo vnútri funkcií shellu."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Reťazec sa odkazuje na premennú prostredia s prázdnym názvom."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "V direktíve číslo %u, znak '%c' nie je číslica medzi 1 a 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Použitie: %s [VOĽBA]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Zobraziť hostiteľské meno stroja.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Výstupný formát:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krátke meno hostiteľa\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          dlhé meno hostiteľa, vrátane plne kvalifikovaného\n"
+"  -f, --fqdn, --long          dlhé meno hostiteľa, vrátane plne "
+"kvalifikovaného\n"
 "                                doménového mena a prezývok\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteľa\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "Nemôžem získať meno hostiteľa"
@@ -938,7 +1045,7 @@ msgstr "Nemôžem získať meno hostiteľa"
 msgid "selector is not specified"
 msgstr "selektor nie je zadaný"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "nemožno vytvoriť kontext XPath"
@@ -948,28 +1055,28 @@ msgstr "nemožno vytvoriť kontext XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "nemožno vyhodnotiť výraz XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "Uzol \"%s\" neobsahuje \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "neplatná hodnota \"%s\" vlastnosti \"%s\""
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "koreňový element nie je \"ruler\" v priestore mien %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "nemožno prečítať %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "nemožno vyhodnotiť cestu umiestnenia XPath: %s"
@@ -989,28 +1096,28 @@ msgstr "nemožno prečítať súbor XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "koreňový element nie je \"locatingRules\""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "povolený najviac jeden vstupný súbor"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vylučujú"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1019,62 +1126,65 @@ msgstr ""
 "Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+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:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupného súboru:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=ADRESÁR     pridať ADRESÁR do zoznamu pre vyhľadávané\n"
 "                              vstupné súbory\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardný vstup.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie výstupného súboru:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1083,234 +1193,274 @@ 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:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Výber správy:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            zachovať preložené, odstrániť nepreložené správy\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            zachovať preložené, odstrániť nepreložené "
+"správy\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          zachovať nepreložené, odstrániť preložené správy\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          zachovať nepreložené, odstrániť preložené "
+"správy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              odstrániť nepresné preklady\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            zachovať nepresné preklady\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           odstrániť zastarané správy označené #~\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zachovať zastarané správy označené #~\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Úprava vlastností:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
+msgstr ""
+"      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        nastaviť všetky správy ako nie zastarané\n"
+msgstr ""
+"      --clear-obsolete        nastaviť všetky správy ako nie zastarané\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              keď je nastavené 'fuzzy', zachovať predchádzajúce\n"
+"      --previous              keď je nastavené 'fuzzy', zachovať "
+"predchádzajúce\n"
 "                              msgid preložených správ.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        odstrániť \"predchádzajúce msgid\" zo všetkých správ\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        odstrániť \"predchádzajúce msgid\" zo všetkých "
+"správ\n"
 
 # c-format
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
-"      --empty                 pri odstraňovaní nepresných prekladov nastaviť\n"
+"      --empty                 pri odstraňovaní nepresných prekladov "
+"nastaviť\n"
 "                              prázdne msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, 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"
+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:485
+#: src/msgattrib.c:484
 #, 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"
+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:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              synonymum pre --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              synonymum pre --only-obsolete --clear-"
+"obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax vstupného súboru:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, 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"
+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:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep ."
+"strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti výstupu:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"                              KEDY môže byť 'always' (vždy), "
+"'never' (nikdy),\n"
 "                              'auto' (automaticky) alebo 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                použiť na výstupe riadiace sekvencie jazyka C,\n"
+"  -E, --escape                použiť na výstupe riadiace sekvencie jazyka "
+"C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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"
+msgstr ""
+"  -i, --indent                zapísať .po súbor s použitím odsadzovania\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
+msgstr ""
+"      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                zapísať .po súbor presne dodržiavajúci štýl\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    zapísať súbor NeXTstep/GNUstep .strings\n"
+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:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ČÍSLO           nastaviť šírku výstupnej strany\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1319,31 +1469,32 @@ msgstr ""
 "      --no-wrap               nezalamovať riadky správ dlhšie ako šírka\n"
 "                              výstupnej strany do viacerých riadkov\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1366,23 +1517,24 @@ msgstr ""
 "--use-first, ktorá zabezpečí ich zachovanie iba z prvého PO súboru, ktorý\n"
 "ich definuje.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=SÚBOR      získať zoznam vstupných súborov zo SÚBORu\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1391,7 +1543,7 @@ msgstr ""
 "  -<, --less-than=POČET       vypísať správy, ktoré sú definované menej ako\n"
 "                              POČET-krát, štandardne nastavené na nekonečno\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1400,7 +1552,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:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1409,14 +1561,16 @@ msgstr ""
 "  -u, --unique                skratka pre --less-than=2, nastavuje výpis\n"
 "                              len unikátnych správ\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, 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"
+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:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1425,46 +1579,49 @@ msgstr ""
 "      --stringtable-input     vstupné súbory majú syntax NeXTstep-GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, 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:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             použiť prvý dostupný preklad pre každú správu,\n"
+"      --use-first             použiť prvý dostupný preklad pre každú "
+"správu,\n"
 "                              nezlučovať viacero prekladov\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=NÁZOVKATALÓGU    nastaviť pole 'Language' v položke hlavička\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=NÁZOVKATALÓGU    nastaviť pole 'Language' v položke hlavička\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "neboli zadané vstupné súbory"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebné sú presne 2 vstupné súbory"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Použitie: %s [VOĽBA] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1481,74 +1638,77 @@ msgstr ""
 "Keď nemožno nájsť presnú zhodu, je použitý fuzzy algoritmus, ktorý\n"
 "umožňuje lepšiu kontrolu zhody.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      preklady\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odkazy na zdrojové súbory\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikátory operácie:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          použiť ref.pot na všetky domény v def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          použiť ref.pot na všetky domény v def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 "  -N, --no-fuzzy-matching     nepoužiť algoritmus pre nájdenie nepresných\n"
 "                              prekladov\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             brať do úvahy nepresné preklady\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --untranslated          brať do úvahy nepreložené preklady\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "táto správa je nepreložená"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "táto správa musí byť skontrolovaná prekladateľom"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, 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:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale táto definícia je podobná"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1556,12 +1716,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:316
+#: 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:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1581,7 +1741,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:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1590,67 +1750,71 @@ 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:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           nezapisovať hlavičku s položkou 'msgid \"\"'\n"
+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:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cieľ konverzie:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
+msgstr ""
+"      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presné dodržiavanie štýlu Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "nie sú zadané vstupné súbory"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "potrebné je presne jeden vstupný súbor"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Použitie: %s [VOĽBA] VSTUPNÝSÚBOR\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1663,22 +1827,22 @@ msgstr ""
 "programom xgettext). Nepreloženým položkám je priradený preklad\n"
 "zhodný s msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO alebo POT súbor\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "chýbajúci názov príkazu"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, 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:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1693,7 +1857,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1702,61 +1866,63 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Vstup príkazu:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   pridať znak konca riadku na koniec vstupu\n"
+msgstr ""
+"  --newline                   pridať znak konca riadku na koniec vstupu\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný PO súbor\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "zápis na štandardný výstup zlyhal"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "chýbajúci názov filtra"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí byť uvedený aspoň jeden sed skript"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] FILTER [VOĽBA-FILTRA]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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:442
+#: src/msgfilter.c:441
 #, 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 ""
-"FILTER môže byť ľubovoľný program, ktorý číta preklady zo štandardného vstupu\n"
+"FILTER môže byť ľubovoľný program, ktorý číta preklady zo štandardného "
+"vstupu\n"
 "a zapisuje upravené preklady na štandardný výstup.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Vstup a výstup filtra:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1766,124 +1932,131 @@ msgstr ""
 "                                a odstrániť znak nového riadka z konca\n"
 "                                výstupu"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=SÚBORSKRIPTU     pridať obsah súboru SÚBORSKRIPTU k výkonávaným\n"
+"  -f, --file=SÚBORSKRIPTU     pridať obsah súboru SÚBORSKRIPTU k "
+"výkonávaným\n"
 "                                príkazom\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       potlačiť automatickú tlač priestoru vzorov\n"
+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:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           zachovať položku hlavičky nezmenenú,\n"
 "                              neodfiltrovať ju\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "výstup filtra nie je ukončený znakom nový riadok"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "parameter pre %s by malo byť len jedno interpunkčné znamienko"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "neplatné poradie bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "ak sú uvedené %s a %s, vstupný súbor nemá byť zadaný"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s vyžaduje špecifikáciu \"--template šablóna\""
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-o súbor\""
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s a %s sa navzájom vylučujú v %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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"
 
-#: src/msgfmt.c:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je platné len s %s, %s alebo %s"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "nemožno nájsť pravidlá ITS pre %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1891,7 +2064,7 @@ msgstr[0] "%d preložených správ"
 msgstr[1] "%d preložená správa"
 msgstr[2] "%d preložené správy"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1899,7 +2072,7 @@ msgstr[0] ", %d nepresných prekladov"
 msgstr[1] ", %d nepresný preklad"
 msgstr[2] ", %d nepresné preklady"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1907,110 +2080,135 @@ msgstr[0] ", %d nepreložených správ"
 msgstr[1] ", %d nepreložená správa"
 msgstr[2] ", %d nepreložené správy"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 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:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  menosúboru.po ...           vstupné súbory\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mód činnosti:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  režim Java: generovať triedu Java "
+"ResourceBundle\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  režim Java: generovať triedu Java ResourceBundle\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 ako --java, ale predpokladať Java2 (JDK 1.2 "
+"alebo\n"
+"                              vyššie)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
-"      --java2                 ako --java, ale predpokladať Java2 (JDK 1.2 alebo\n"
-"                              vyššie)\n"
+"      --csharp                režim C#: generovať .dll súbor pre .NET\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                režim C#: generovať .dll súbor pre .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      režim zdrojov C#: generovať .resources súbor "
+"pre .NET\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      režim zdrojov C#: generovať .resources súbor pre .NET\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   režim Tcl: generovať súbor .msg tcl/msgcat\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   režim Tcl: generovať súbor .msg tcl/msgcat\n"
-
-#: src/msgfmt.c:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    režim Qt: generovať Qt súbor .qm\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               režim položiek pracovnej plochy: generovať súbor .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               režim položiek pracovnej plochy: generovať "
+"súbor .desktop\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   režim XML: generovať súbor XML\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                povoliť presne dodržaný režim Uniforum\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime Java:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
 "  -l, --locale=N_PROSTREDIE   názov národného prostredia, buď jazyk alebo\n"
 "                              jazyk_KRAJINA\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                vytvorí súbor .java, namiesto súboru .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                vytvorí súbor .java, namiesto súboru .class\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d ADRESÁR                  základný adresár adresárov hierarchie tried\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d ADRESÁR                  základný adresár adresárov hierarchie tried\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -2018,58 +2216,64 @@ msgstr ""
 "oddelené znakom \"_\". Voľba -d je povinná. Trieda je zapísaná do zadaného\n"
 "adresára.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d ADRESÁR                  základný adresár pre lokálne závislé .dll súbory\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d ADRESÁR                  základný adresár pre lokálne závislé .dll "
+"súbory\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, 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 ""
-"Voľby -l a -d sú povinné. Súbor .dll je zapísaný do podadresára zadaného adresára,\n"
+"Voľby -l a -d sú povinné. Súbor .dll je zapísaný do podadresára zadaného "
+"adresára,\n"
 "ktorého názov závisí od národného prostredia.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime Tcl:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
+msgstr ""
+"Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Voľby pre položky pracovnej plochy:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=ŠABLÓNA          súbor .desktop použitý ako šablóna\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d ADRESÁR                  základný adresár súborov .po\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2078,190 +2282,209 @@ msgstr ""
 "  -kSLOVO, --keyword=SLOVO    hľadať SLOVO ako ďalšie kľúčové slovo\n"
 "  -k, --keyword               nepoužiť predvolené kľúčové slová)\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Voľby -l, -o a --template sú povinné.  Ak je zadané -D, vstupné súbory sú\n"
 "načítané zo zadaného adresára, namiesto z parametrov príkazového riadka.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Volby režimu XML:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NÁZOV        použiť zadaný jazyk XML\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=ŠABLÓNA          súbor XML použitý ako šablóna\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretácia vstupného súboru:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 vykonať všetky kontroly ako pri\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          kontrolovať jazykovo závislé formátované reťazce\n"
+msgstr ""
+"      --check-format          kontrolovať jazykovo závislé formátované "
+"reťazce\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          overiť prítomnosť a obsah položky hlavičky\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          overiť prítomnosť a obsah položky hlavičky\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          kontrolovať konflikty medzi direktívami domény\n"
+"      --check-domain          kontrolovať konflikty medzi direktívami "
+"domény\n"
 "                                a voľbou --output-file\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   kontrolovať, či sa GNU msgfmt správa tak ako\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=ZNAK]  kontrolovať prítomnosť klávesových skratiek\n"
+"      --check-accelerators[=ZNAK]  kontrolovať prítomnosť klávesových "
+"skratiek\n"
 "                                pre položky menu\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=POČET       zarovnať reťazce na POČET bajtov (štandardne: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=POČET       zarovnať reťazce na POČET bajtov (štandardne: "
+"%d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=PORADIEBAJTOV zapísať 32-bitové čísla v zadanom poradí bajtov\n"
-"                                 (big alebo little, predvolené závisí na platforme)\n"
+"      --endianness=PORADIEBAJTOV zapísať 32-bitové čísla v zadanom poradí "
+"bajtov\n"
+"                                 (big alebo little, predvolené závisí na "
+"platforme)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               binárny súbor nebude obsahovať hašovaciu tabuľku\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               binárny súbor nebude obsahovať hašovaciu "
+"tabuľku\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziť štatistiky prekladov\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvýšiť úroveň táravosti\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "upozornenie: hlavička súboru PO chýba alebo je neplatná\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungovať\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "upozornenie: hlavička súboru PO je nepresná\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "upozornenie: staršie verzie msgfmt vrátia pri tomto chybu\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "meno domény \"%s\" nie je použitelné ako meno súboru: použije sa predpona"
+msgstr ""
+"meno domény \"%s\" nie je použitelné ako meno súboru: použije sa predpona"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktíva 'domain %s' bola ignorovaná"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prázdna položka 'msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "nepresná položka 'msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s neexistuje"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existuje, ale nedá sa čítať"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri čítaní súboru \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "voľba '%c' nemôže byť použitá pred špecifikovaným 'J' alebo 'K' alebo 'T' alebo 'C' alebo 'X'"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"voľba '%c' nemôže byť použitá pred špecifikovaným 'J' alebo 'K' alebo 'T' "
+"alebo 'C' alebo 'X'"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2270,7 +2493,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2347,35 +2570,44 @@ msgstr ""
 "  -v, --invert-match          vytlačiť len tie správy, ktoré nevyhovujú žiadnemu\n"
 "                              výberovému kritériu\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                použiť na výstupe riadiace sekvencie jazyka C,\n"
+"      --escape                použiť na výstupe riadiace sekvencie jazyka "
+"C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generovať utriedený výstup\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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:298
+msgstr ""
+"      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Ste v jazykovo neutrálnom prostredí. Prosím nastavte vašu\n"
 "premennú prostredia LANG tak, ako je to uvedené v súbore\n"
 "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestovať\n"
 "vaše preklady.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2386,12 +2618,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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Vytvorený %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2400,26 +2632,28 @@ msgstr ""
 "Vytvorí nový PO súbor, inicializuje meta informácie podľa hodnôt z prostredia\n"
 "používateľa.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný POT súbor\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Ak nie je zadaný vstupný súbor, bude vyhľadaný POT súbor v aktuálnom adresári.\n"
+"Ak nie je zadaný vstupný súbor, bude vyhľadaný POT súbor v aktuálnom "
+"adresári.\n"
 "Ak je -, načítaný je štandardný vstup.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2429,17 +2663,21 @@ 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:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          nastaviť cieľové národné prostredie\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         označiť, že PO súbor je generovaný automaticky\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         označiť, že PO súbor je generovaný "
+"automaticky\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2447,12 +2685,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:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "chyba pri čítaní adresára"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2460,84 +2698,95 @@ 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:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zlyhal s ukončovacím kódom %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Nový katalóg správ by mal obsahovať adresu elektronickej pošty, aby vám používatelia\n"
-"mohli poslať pripomienky k prekladom a aby vás mohol správca kontaktovať v prípade\n"
+"Nový katalóg správ by mal obsahovať adresu elektronickej pošty, aby vám "
+"používatelia\n"
+"mohli poslať pripomienky k prekladom a aby vás mohol správca kontaktovať v "
+"prípade\n"
 "neočakávaných technických problémov.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor '%s' nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:208
+#: 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 "doména \"%s\" vo vstupnom súbore '%s' nemá v hlavičke uvedenú znakovú sadu"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"doména \"%s\" vo vstupnom súbore '%s' nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "upozornenie: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Vstupné súbory obsahujú správy v rozdielnych kódovaniach, medzi inými aj v UTF-8.\n"
+"Vstupné súbory obsahujú správy v rozdielnych kódovaniach, medzi inými aj v "
+"UTF-8.\n"
 "Konvertujem výstup do UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Vstupné súbory obsahujú správy v rozdielnych kódovaniach, medzi inými aj v %s a v %s.\n"
+"Vstupné súbory obsahujú správy v rozdielnych kódovaniach, medzi inými aj v "
+"%s a v %s.\n"
 "Konvertujem výstup do UTF-8.\n"
 "Iné výstupné kódovanie si môžete zvoliť pomocou voľby --to-code.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2550,7 +2799,7 @@ msgstr ""
 "Buď zmeňte všetky msgid a msgctxt na čisté ASCII alebo sa uistite, že sú\n"
 "od počiatku kódované v UTF-8, t.j. už vo vašich zdrojových súboroch.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2563,12 +2812,12 @@ msgstr ""
 "Výstup z '%s' môže byť nesprávny.\n"
 "Možné riešenia sú:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Nastaviť LC_ALL na národné prostredie s kódovaním %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2579,7 +2828,7 @@ msgstr ""
 "  potom použiť '%s',\n"
 "  potom konvertovať späť na %s pomocou 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2592,7 +2841,7 @@ msgstr ""
 "  potom použiť '%s',\n"
 "  potom konvertovať späť na %s pomocou 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2611,7 +2860,9 @@ msgstr "výraz pre množné číslo môže nadobúdať záporné hodnoty"
 #: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu, ale výraz pre množné číslo môže nadobúdať hodnoty väčšie ako %lu"
+msgstr ""
+"nplurals = %lu, ale výraz pre množné číslo môže nadobúdať hodnoty väčšie ako "
+"%lu"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
@@ -2622,8 +2873,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "výraz pre množné číslo môže spôsobiť celočíselné pretečenie"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "výraz pre množné číslo môže spôsobiť aritmetickú výnimku, pravdepodobne delenie nulou"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"výraz pre množné číslo môže spôsobiť aritmetickú výnimku, pravdepodobne "
+"delenie nulou"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2672,10 +2927,14 @@ msgstr[1] "ale niektoré správy majú %lu tvar množného čísla"
 msgstr[2] "ale niektoré správy majú %lu tvary množných čísel"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "katalóg správ má preklady s množnými číslami, ale v hlavičke chýba \"Plural-Forms: nplurals=ČÍSLO; plural=VÝRAZ;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"katalóg správ má preklady s množnými číslami, ale v hlavičke chýba \"Plural-"
+"Forms: nplurals=ČÍSLO; plural=VÝRAZ;\""
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgid_plural' nezačínajú obe s '\\n'"
 
@@ -2684,11 +2943,11 @@ msgstr "položky 'msgid' a 'msgid_plural' nezačínajú obe s '\\n'"
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgstr[%u]' nezačínajú obe s '\\n'"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgstr' nezačínajú obe s '\\n'"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgid_plural' nie sú obe ukončené s '\\n'"
 
@@ -2697,11 +2956,11 @@ msgstr "položky 'msgid' a 'msgid_plural' nie sú obe ukončené s '\\n'"
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgstr[%u]' nie sú obe ukončené s '\\n'"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgstr' nie sú obe ukončené s '\\n'"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie množných čísel je rozšírením GNU"
 
@@ -2733,15 +2992,15 @@ msgstr "ASCII vypustenie ('...') namiesto Unicode"
 msgid "space before ellipsis found in user visible strings"
 msgstr "nájdená medzera pred vypustením v reťazci viditeľnom používateľmi"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "použité ASCII dvojité úvodzovky namiesto Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "použité ASCII jednoduché úvodzovky namiesto Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "ASCII gulička ('%c') namiesto Unicode"
@@ -2756,37 +3015,49 @@ msgstr "%s: vstup nie je platný v kódovaní \"%s\""
 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:290
+#: src/msgl-iconv.c:288
 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:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() nepodporuje takúto konverziu."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
+"nepodporuje takúto konverziu."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa stanú rovnakými."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa "
+"stanú rovnakými."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia bola preložená bez iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia "
+"bola preložená bez iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je platné len s %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "typ zálohy"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2810,17 +3081,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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      preklady podľa starých zdrojových súborov\n"
+msgstr ""
+"  def.po                      preklady podľa starých zdrojových súborov\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odkazy na nové zdrojové súbory\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2829,7 +3101,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:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2838,30 +3110,31 @@ msgstr ""
 "  -U, --update                aktualizovať def.po,\n"
 "                              nerobiť nič, ak def.po je aktuálny\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime aktualizácie:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, 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:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2875,106 +3148,132 @@ msgstr ""
 "  existing, nil   numbered, ak existuje číslovaná záloha, inak simple\n"
 "  simple, never   vždy vytvoriť jednoduchú zálohu\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              zachovať predchádzajúce msgid preložených správ\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              zachovať predchádzajúce msgid preložených "
+"správ\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       potlačiť indikátory postupu\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, 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:1650
+#: src/msgmerge.c:1706
 #, 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:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sNačítané %ld starých + %ld odkazov, %ld zlučených, %ld nepresných, %ld chýbajucich, %ld zrušených.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+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:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " hotovo.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [SÚBOR]...\n"
 
-#: src/msgunfmt.c:432
+#: 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:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  režim Java: vstup je trieda Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  režim Java: vstup je trieda Java "
+"ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      režim zdrojov C#: vstup je .resources súbor pre .NET\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      režim zdrojov C#: vstup je .resources súbor "
+"pre .NET\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   režim Tcl: vstup je súbor .msg tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   režim Tcl: vstup je súbor .msg tcl/msgcat\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  SÚBOR ...                   vstupné .mo súbory\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Umiestnenie vstupného súboru v režime Java:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 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:468
+#: 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:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2983,29 +3282,33 @@ 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:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Umiestnenie vstupného súboru v režime Tcl:\n"
 
-#: src/msgunfmt.c:486
+#: 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 "Voľby -l a -d sú povinné. Súbor .msg je umiestnený v zadanom adresári.\n"
+msgstr ""
+"Voľby -l a -d sú povinné. Súbor .msg je umiestnený v zadanom adresári.\n"
 
-#: src/msgunfmt.c:512
+#: 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"
+msgstr ""
+"  -i, --indent                zapísať pomocou odsadeného výstupného štýlu\n"
 
-#: src/msgunfmt.c:514
+#: 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"
+msgstr ""
+"      --strict                zapísať súbor s presne dodržaným štýlom "
+"uniforum\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3026,17 +3329,21 @@ 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:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                zobraziť len unikátne správy, potlačiť duplikáty\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                zobraziť len unikátne správy, potlačiť "
+"duplikáty\n"
 
-#: src/open-catalog.c:57 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 "<štandardný vstup>"
@@ -3097,27 +3404,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "nekonzistentné použitie #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "chýba sekcia 'msgstr[]'"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "chýba sekcia 'msgid_plural'"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "chýba sekcia 'msgstr'"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvé množné číslo má nenulový index"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množné číslo má nesprávny index"
@@ -3127,7 +3434,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:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná viacznaková sekvencia"
@@ -3137,41 +3444,41 @@ msgstr "neplatná viacznaková sekvencia"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nekompletná viacznaková sekvencia na konci súboru"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nekompletná viacznaková sekvencia na konci riadka"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv zlyhal"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "neznáme kľúčové slovo \"%s\""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "neplatná riadiaca sekvencia"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "koniec súboru uprostred reťazca"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "koniec riadka uprostred reťazca"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "oddeľovač kontextu <EOT> v reťazci"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
@@ -3201,7 +3508,7 @@ msgstr "chýbajúce '=' za \"%s\""
 msgid "invalid non-blank line"
 msgstr "neplatný neprázdny riadok"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "súbor \"%s\" je skrátený"
@@ -3211,29 +3518,45 @@ msgstr "súbor \"%s\" je skrátený"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "súbor \"%s\" obsahuje reťazce, ktoré nie sú ukončené nulou"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "súbor \"%s\" obsahuje reťazce, ktoré nie sú ukončené nulou"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "súbor \"%s\" nie je vo formáte GNU .mo"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "súbor \"%s\" obsahuje reťazec, ktorý nie je ukončený nulou, na %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "upozornenie: neplatná syntax \\uxxxx pre znak Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: upozornenie: osamotený náhradník U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "upozornenie: neplatný znak Unicode"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "upozornenie: neukončený reťazec"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "upozornenie: chyba syntaxe"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "upozornenie: neukončený pár kľúč/hodnota"
 
@@ -3241,29 +3564,29 @@ msgstr "upozornenie: neukončený pár kľúč/hodnota"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "upozornenie: chyba syntaxe, očakávané ';' po reťazci"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "upozornenie: chyba syntaxe, očakávané '=' alebo ';' po reťazci"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Napísal %s a %s.\n"
+msgstr "Napísali %s a %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Prekódovať srbský text z cyriliky do latinky.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3272,27 +3595,27 @@ msgstr ""
 "Vstupný text je čítaný zo štandardného vstupu. Konvertovaný text je vytlačený\n"
 "na štandardný výstup.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "vstup nie je platný v kódovaná \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pri konverzii kódovania z \"%s\" do \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "očakávané dva parametre"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Použitie: %s [VOĽBA] URL SÚBOR\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3301,111 +3624,135 @@ msgstr ""
 "Stiahne a zobrazí obsah z URL. Ak URL nie je dostupné, použije sa SÚBOR\n"
 "z lokálneho disku.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pri čítaní \"%s\""
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "chyba pri zápise na štandardný výstup"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba po čítaní \"%s\""
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Získavanie %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " časový limit vypršal.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " zlyhalo.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Nemožno zapísať viacnásobné prekladové domény do jedného súboru v zadanom výstupnom formáte. Skúste použiť namiesto toho syntax PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Nemožno zapísať viacnásobné prekladové domény do jedného súboru v zadanom "
+"výstupnom formáte. Skúste použiť namiesto toho syntax PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Nemožno zapísať viacnásobné prekladové domény do jedného súboru v zadanom výstupnom formáte."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Nemožno zapísať viacnásobné prekladové domény do jedného súboru v zadanom "
+"výstupnom formáte."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "katalóg správ má preklady závisiace od kontextu, ale výstupný formát ich nepodporuje."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"katalóg správ má preklady závisiace od kontextu, ale výstupný formát ich "
+"nepodporuje."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "katalóg správ má preklady v tvaroch množného čísla, ale výstupný formát ich nepodporuje. Skúste pregenerovať Java triedu pomocou \"msgfmt --java\", namiesto súboru vlastností."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"katalóg správ má preklady v tvaroch množného čísla, ale výstupný formát ich "
+"nepodporuje. Skúste pregenerovať Java triedu pomocou \"msgfmt --java\", "
+"namiesto súboru vlastností."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "katalóg správ má preklady s množnými číslami, ale výstupný formát ich nepodporuje."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"katalóg správ má preklady s množnými číslami, ale výstupný formát ich "
+"nepodporuje."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nemožno vytvoriť výstupný súbor \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "štandardný výstup"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "zlyhalo vytvorenie adresára \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, 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:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilácia triedy C# zlyhala"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platným názvom triedy Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, 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"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "nekompletná viacznaková sekvencia"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu '\\%c'"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3418,7 +3765,7 @@ msgstr ""
 "ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3441,7 +3788,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3459,12 +3807,12 @@ msgstr ""
 "formát katalógu správ Qt podporuje Unicode len v preložených reťazcoch\n"
 "a nie v nepreložených reťazcoch\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "chyba počas zápisu do do podprocesu %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3472,7 +3820,7 @@ msgstr ""
 "katalóg správ má preklady závislé od kontextu,\n"
 "ale formát C# .resources nepodporuje kontexty\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3480,7 +3828,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát C# .resources nepodporuje množné čísla\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3488,7 +3836,7 @@ msgstr ""
 "katalóg správ má preklady závislé od kontextu,\n"
 "ale formát katalógu správ Tcl nepodporuje kontexty\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3496,36 +3844,56 @@ 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-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukončený reťazec"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornenie: neukončený regulárny výraz"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "upozornenie: neplatný znak Unicode"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: upozornenie: neplatný znak Unicode"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornenie: neukončená znaková konštanta"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosím, zadajte kódovanie zdroja pomocou --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3534,7 +3902,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3543,7 +3911,7 @@ msgstr ""
 "%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3552,7 +3920,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3561,12 +3929,12 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadka.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv zlyhal"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3575,119 +3943,142 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: upozornenie: neplatný znak Unicode"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: upozornenie: neukončená reťazcová konštanta"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: upozornenie: nájdené ')' tam, kde bolo očakávané '}'"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo očakávané ')'"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s' nie je platný názov kódovania.  Použijem ASCII namiesto neho.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "kontrola syntaxe '%s' je neznáma"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "typ ukončenia vety '%s' je neznámy"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, 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"
+msgstr ""
+"--join-existing nemožno použiť ak je výstup posielaný na štandardný výstup"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, 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:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "upozornenie: súbor pravidiel ITS '%s' neexistuje"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "upozornenie: súbor pravidiel ITS '%s' neexistuje; skontrolujte vašu inštaláciu gettext-u"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"upozornenie: súbor pravidiel ITS '%s' neexistuje; skontrolujte vašu "
+"inštaláciu gettext-u"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, 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:1040
+#: src/xgettext.c:1027
 #, 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:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NÁZOV  použiť NÁZOV.po pre výstup (namiesto messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NÁZOV  použiť NÁZOV.po pre výstup (namiesto messages."
+"po)\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, 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:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=ADRESÁR    výstupné súbory budú umiestnené v adresári ADRESÁR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=ADRESÁR    výstupné súbory budú umiestnené v adresári "
+"ADRESÁR\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Voľba jazyka vstupného súboru:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NÁZOV        použiť zadaný jazyk\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+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:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3696,37 +4087,41 @@ msgstr ""
 "      --from-code=NÁZOV       kódovanie vstupných súborov\n"
 "                                (s výnimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, 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:1096
+#: src/xgettext.c:1083
 #, 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:1098
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=SÚBOR.po  položky zo súboru SÚBOR.po nie sú "
+"extrahované\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cZNAČKA, --add-comments=ZNAČKA umiestniť bloky komentára začínajúce ZNAČKOU\n"
+"  -cZNAČKA, --add-comments=ZNAČKA umiestniť bloky komentára začínajúce "
+"ZNAČKOU\n"
 "                                a predchádzajúce riadky s kľúčovými slovami\n"
 "                                do výstupného súboru\n"
 "  -c, --add-comments          umiestniť všetky bloky komentára, ktoré\n"
 "                                predchádzajú riadky s kľúčovými slovami,\n"
 "                                do výstupného súboru\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3737,7 +4132,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3748,252 +4143,200 @@ msgstr ""
 "                                (single-space, ktoré je predvolené,\n"
 "                                 alebo double-space)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Voľby špecifické pre jednotlivé jazyky:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (len jazyky C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (len jazyky C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=SLOVO:PAR:PRÍZN  prídavný príznak pre reťazce v parametri číslo\n"
+"      --flag=SLOVO:PAR:PRÍZN  prídavný príznak pre reťazce v parametri "
+"číslo\n"
 "                              ARG kľúčového slova SLOVO\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (len jazyky C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, 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:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=SÚBOR             použiť pravidlá ITS zo SÚBORu\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (len jazyky založené na XML)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (len jazyk C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozoznať formát reťazcov KDE 4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 detailnejšie výsledky rozoznávania formátovacích\n"
+"      --debug                 detailnejšie výsledky rozoznávania "
+"formátovacích\n"
 "                              reťazcov\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, 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:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               zapísať komentáre itstool\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, 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"
+msgstr ""
+"      --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
+"výstupe\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, 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:1207
+#: src/xgettext.c:1194
 #, 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:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=EMAIL@ADRESA  nastaviť adresu pre oznamovanie chýb\n"
+"      --msgid-bugs-address=EMAIL@ADRESA  nastaviť adresu pre oznamovanie "
+"chýb\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[REŤAZEC], --msgstr-prefix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako predponu\n"
+"  -m[REŤAZEC], --msgstr-prefix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako "
+"predponu\n"
 "                                pre hodnoty msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[REŤAZEC], --msgstr-suffix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako príponu pre\n"
+"  -M[REŤAZEC], --msgstr-suffix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako "
+"príponu pre\n"
 "                                hodnoty msgstr\n"
 
-#: src/xgettext.c:2040
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Parameter pre --flag nemá tvar <kľúčové_slovo>:<č_param>:[pass-]<príznak>: %s"
-
-#: src/xgettext.c:2165
-msgid "standard input"
-msgstr "štandardný vstup"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Nie ASCII znak na %s%s."
-
-#: src/xgettext.c:2334
+#: src/xgettext.c:1597
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Nie ASCII komentár na alebo pred %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Nie ASCII reťazec na %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: upozornenie: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-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:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. Dôvod: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"Formátovací reťazec '%s' s nepomenovanými parametrami nemôže byť správne\n"
-"upravený pre národné prostredie:\n"
-"Prekladateľ nemôže zmeniť poradie parametrov.\n"
-"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:2545
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Prázdne msgid. To je vyhradené pre GNU gettext:\n"
-"gettext(\"\") vráti hlavičku s meta informáciami\n"
-"a nie prázdny reťazec.\n"
+"Parameter pre --flag nemá tvar <kľúčové_slovo>:<č_param>:[pass-]<príznak>: %s"
 
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "nejednoznačne zadaný parameter pre kľúčové slovo '%.*s'"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
-
-#: src/xgettext.c:3334
-#, 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:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "nezhoda kontextu medzi jednotným a množným číslom"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "štandardný vstup"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4005,21 +4348,16 @@ msgstr ""
 "MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
 "riadka --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jazyk '%s' je neznámy"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: upozornenie: osamotený náhradník U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Prosím, zadajte kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4028,7 +4366,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4037,7 +4375,7 @@ msgstr ""
 "%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4046,7 +4384,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4055,7 +4393,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadka.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4064,148 +4402,200 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte kódovanie zdroja pomocou --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: upozornenie: reťazec RegExp je ukončený príliš skoro"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: upozornenie: %s nie je dovolené"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: upozornenie: neukončená značka XML"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: neplatná interpolácia premennej na \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 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:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte správne 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:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
 "Prosím, zadajte správne 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:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-codei alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadka.\n"
 "Prosím, zadajte správne 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:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "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:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznáme kódovanie \"%s\". Pokračujem namiesto neho s ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neplatná definícia reťazca"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: chýbajúce číslo za #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: neplatný výraz reťazca"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: neplatná definícia reťazca"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: neplatná definícia reťazca"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných dôvodov; použite namiesto toho eval_gettext"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných "
+"dôvodov; použite namiesto toho eval_gettext"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: upozornenie: reťazec regulárneho výrazu je ukončený príliš skoro"
+msgstr ""
+"%s:%d: upozornenie: reťazec regulárneho výrazu je ukončený príliš skoro"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
@@ -4332,3 +4722,104 @@ msgstr "v komentári alebo vykonávacom pokyne"
 #, c-format
 msgid "document ended unexpectedly: %s"
 msgstr "dokument skončil neočakávane: %s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: voľba '--%s' nepovoľuje parameter\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: neznáma voľba '--%s'\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: voľba '-W %s' nie je jednoznačná\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "upozornenie: hlavička súboru PO je nepresná\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "upozornenie: staršie verzie msgfmt vrátia pri tomto chybu\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Nie ASCII znak na %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Nie ASCII komentár na alebo pred %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Nie ASCII reťazec na %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: upozornenie: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ 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"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. "
+#~ "Dôvod: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Formátovací reťazec '%s' s nepomenovanými parametrami nemôže byť správne\n"
+#~ "upravený pre národné prostredie:\n"
+#~ "Prekladateľ nemôže zmeniť poradie parametrov.\n"
+#~ "Prosím, zvážte použitie formátovacieho reťazca s pomenovanými "
+#~ "parametrami\n"
+#~ "a mapovaním namiesto zoznamu parametrov.\n"
+
+#~ 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 ""
+#~ "Prázdne msgid. To je vyhradené pre GNU gettext:\n"
+#~ "gettext(\"\") vráti hlavičku s meta informáciami\n"
+#~ "a nie prázdny reťazec.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "nejednoznačne zadaný parameter pre kľúčové slovo '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
+
+#, 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'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "nezhoda kontextu medzi jednotným a množným číslom"
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index 07ea0d0a4..8ec2c716b 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -1,35 +1,37 @@
 # -*- mode:po; coding:utf-8; -*- Slovenian messages for GNU gettext package
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2011, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013, 2014, 2015.
+# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013, 2014, 2015, 2018.
 #
-# $Id: gettext-tools-0.19.7-rc1.sl.po,v 1.3 2015/12/26 15:50:07 peterlin Exp $
+# $Id: gettext-tools-0.19.8-rc1.sl.po,v 1.1 2018/07/28 22:07:37 peterlin Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-22 17:59+0900\n"
-"PO-Revision-Date: 2015-12-26 16:49+0100\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-07-29 00:07+0200\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\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"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "neveljaven argument %s za %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "dvoumen argument %s za %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
@@ -57,152 +59,133 @@ msgstr "začasnega imenika %s ni mogoče odstraniti"
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "ohranjamo dovoljenja za %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "datoteke %s ni moč odpreti za branje"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "varnostne kopije %s ni mogoče odpreti za pisanje"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "napaka pri branju %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "napaka pri pisanju na %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "klic fdopen() neuspešen"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Prevajalnika za C# ni najti; poskusite namestiti pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Virtualnega stroja za C# ni najti; poskusite namestit pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces neuspešen"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: izbira »%s« ni enopomenska; možnosti:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: izbira »%s« ni enopomenska\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: izbira »%s« ni enopomenska; možnosti:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neprepoznana izbira »%c%s«\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: izbira »--%s« zahteva argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznana izbira »--%s«\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznana izbira »%c%s«\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neveljavna izbira -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: izbira zahteva argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: izbira »-W %s« ni enopomenska\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: izbira »-W %s« zahteva argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "neveljaven argument source_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neveljaven argument target_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje »%s« neuspešno"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko »%s«"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
@@ -210,49 +193,50 @@ msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
+msgstr ""
+"Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/I napaka v podprocesu %s"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "ustvarjanje niti ni uspelo"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "posredovanje podatkov podprocesu %s neuspešno"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "branje izhoda podprocesa %s neuspešno"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, 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"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "povezava s podprocesom %s neuspešna"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s zaključil z izhodno kodo %d"
@@ -276,13 +260,13 @@ msgstr "podproces %s zaključil z izhodno kodo %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "«"
 
@@ -291,64 +275,69 @@ msgstr "«"
 msgid "setting permissions for %s"
 msgstr "nastavljamo dovoljenja za %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "cevovoda ni mogoče ustvariti"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Klic _open_osfhandle neuspešen"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ni mogoče povrniti fd %d: klic dup2 ni uspel"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "podproces %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s prejel kritični signal %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Korenski element mora biti <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Element <%s> ne vsebuje elementa <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Element <%s> nima prilastka <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Uporaba: %s [IZBIRA] [LOKACIJA PRAVILA]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -364,7 +353,7 @@ msgstr ""
 "gettext. Če ni podan noben argument, se množinska pravila CLDR preberejo\n"
 "s standardnega vhoda.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,27 +362,27 @@ msgstr ""
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko. Enako za neobvezne argumente.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  izpiši množinska pravila v zapisu CLDR\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ta navodila\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               različica programa\n"
@@ -402,25 +391,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -429,77 +423,78 @@ msgstr ""
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor(ica) %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s ni mogoče prebrati"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr " ni mogoče pridobiti pravil za %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "pravila CLDR ni mogoče razčleniti"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "odvečni operand %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "datoteke \"%s\" ni moč odpreti za branje"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+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 »%s« ne obstaja"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "formatni določili v »%s« in »%s« za argument %u nista enaki"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiva številka %u se začenja z »|«, vendar se ne zaključuje z »|«."
@@ -509,57 +504,69 @@ msgstr "Direktiva številka %u se začenja z »|«, vendar se ne zaključuje z �
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "»%s« ni veljaven formatni niz %s, za razliko od »%s« . Razlog: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "V direktivi številka %u element za »<« ni ime makroukaza, ki določa obliko. Veljavna imena makroukazov so navedena v ISO C 99, razdelek 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"V direktivi številka %u element za »<« ni ime makroukaza, ki določa obliko. "
+"Veljavna imena makroukazov so navedena v ISO C 99, razdelek 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktivi številka %u elementu za »<« ne sledi »>«. "
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"Niz se sklicuje na argument številka %u, vendar ne upošteva argumenta št. %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "števili formatnih določil v »%s« in »%s« se ne ujemata"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "V direktivi števika %u oklepaju »{« ne sledi število argumentov."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "V direktivi številka %u vejici »,« ne sledi število."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-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 »}«."
+#: src/format-csharp.c:127 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 »}«."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Direktivo številka %u zaključuje neveljaven znak »%c« namesto zaklepaja »}«."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Direktivo številka %u zaključuje neveljaven znak »%c« namesto zaklepaja »}«."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, 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:162 src/format-java.c:347
-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 »{«."
+#: src/format-csharp.c:158 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 »{«."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Niz vsebuje zaklepaj »}« brez para za direktivo številka %u."
@@ -576,12 +583,17 @@ msgstr "V direktivi številka %u natančnost pred »%c« ni dovoljena."
 
 #: 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 "V direktivi številka %u mora biti številka argumenta za natančnost enaka %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"V direktivi številka %u mora biti številka argumenta za natančnost enaka %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+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:406
@@ -619,93 +631,131 @@ msgid "The string ends in the middle of a directive."
 msgstr "Niz se konča sredi direktive."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Niz se sklicuje na argumente tako prek opuščenih števlik argumentov kot prek neoštevilčenih določil argumentov."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Niz se sklicuje na argumente tako prek opuščenih števlik argumentov kot prek "
+"neoštevilčenih določil argumentov."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "V direktivi številka %u argument številka 0 ni pozitivno celo število."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "V direktivi številka %u argumenta številka 0 širine ni pozitivno celo število."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"V direktivi številka %u argumenta številka 0 širine ni pozitivno celo "
+"število."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "V direktivi številka %u argumenta številka 0 natančnosti ni pozitivno celo število."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"V direktivi številka %u argumenta številka 0 natančnosti ni pozitivno celo "
+"število."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "V direktivi številka %u znak »%c« ni veljavno določilo pretvorbe."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Znak, ki zaključuje direktivo številka %u, ni veljavno določilo pretvorbe."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Znak, ki zaključuje direktivo številka %u, ni veljavno določilo pretvorbe."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Niz se sklicuje na argument številka %u na nezdružljive načine."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "V direktivi številka %u podniz »%s« ni veljaven slog datuma/ure."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "V direktivi številka %u nizu »%s« ne sledi vejica."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "V direktivi številka %u podniz »%s« ni veljaven slog števila."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "V direktivi številka %u argumentu števila ne sledi vejica ali eno od naštetega: »%s«, »%s«, »%s« ali »%s«."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"V direktivi številka %u argumentu števila ne sledi vejica ali eno od "
+"naštetega: »%s«, »%s«, »%s« ali »%s«."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "V direktivi številka %u izbira ne vsebuje števila."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-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«."
+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«."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "formatno določilo za argument {%u}, ki je v »%s« ni, v »%s« ne obstaja"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formatni določili v »%s« in »%s« za argument {%u} nista enaki"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Niz se sklicuje na argument številka %u, vendar ne upošteva argumentov %u in %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Niz se sklicuje na argument številka %u, vendar ne upošteva argumentov %u in "
+"%u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "formatno določilo za argumenta %u in %u ne obstaja v »%s«, samo en argument se lahko prezre"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"formatno določilo za argumenta %u in %u ne obstaja v »%s«, samo en argument "
+"se lahko prezre"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -716,17 +766,33 @@ msgstr "napaka pri razčlembi: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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«."
+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«."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-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."
-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."
+msgid ""
+"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."
+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."
+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."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -756,7 +822,9 @@ msgstr "V direktivi številka %u je podan tako modifikator @ kot modifikator :."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr "V direktivi številka %u, »~:[« ne sledita dva člena, ločena z »~;«."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
@@ -778,159 +846,199 @@ msgstr "formatni določili v »%s« in »%s« nista enakovredni"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formatna določila v »%s« niso podmnožica tistih v »%s«"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "V direktivi številka %u je določilo velikosti nezdružljivo s pretvornim faktorjem »%c«."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"V direktivi številka %u je določilo velikosti nezdružljivo s pretvornim "
+"faktorjem »%c«."
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "V direktivi številka %u »%c« ne more začenjati imena polja."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "V direktivi števika %u »%c« ne more začenjati argumenta getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "V direktivi številka %u »%c« ne more začenjati argumenta getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "V direktivi številka %u ni dovoljeno nadaljnje gnezdenje formatnega določilnika."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"V direktivi številka %u ni dovoljeno nadaljnje gnezdenje formatnega "
+"določilnika."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "V direktivi številka %u je nezaključena formatna direktiva."
 
-#: src/format-python.c:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Niz se sklicuje na argumente tako prek njihovih imen kot prek nepoimenovanih določil argumentov."
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Niz se sklicuje na argumente tako prek njihovih imen kot prek nepoimenovanih "
+"določil argumentov."
 
-#: src/format-python.c:355
+#: 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:431
+#: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "formatno določilo v »%s« zahteva preslikavo, tisto v »%s« pa pričakuje n-terček"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"formatno določilo v »%s« zahteva preslikavo, tisto v »%s« pa pričakuje n-"
+"terček"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "formatno določilo v »%s« zahteva n-terček, tisto v »%s« pa pričakuje preslikavo"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"formatno določilo v »%s« zahteva n-terček, tisto v »%s« pa pričakuje "
+"preslikavo"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formatno določilo za argument »%s«, kot v »%s«, v »%s« ne obstaja"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formatni določili v »%s« in »%s« za argument »%s« nista enaki"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "»%s« je enostaven formatni niz, »%s« pa ne: vsebuje zastavico »L« ali dvoštevilčno število argumenta"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"»%s« je enostaven formatni niz, »%s« pa ne: vsebuje zastavico »L« ali "
+"dvoštevilčno število argumenta"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "Niz se sklicuje na spremenljivko ukazne lupine, katere ime vsebuje ne-ASCII znake."
+msgstr ""
+"Niz se sklicuje na spremenljivko ukazne lupine, katere ime vsebuje ne-ASCII "
+"znake."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Niz se sklicuje na spremenljivko ukazne lupine z kompleksno skladnjo oklepajev ukazne lupine. Ta skladnja zaradi varnostnih razlogov tu ni podprta."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Niz se sklicuje na spremenljivko ukazne lupine z kompleksno skladnjo "
+"oklepajev ukazne lupine. Ta skladnja zaradi varnostnih razlogov tu ni "
+"podprta."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Niz se sklicuje na spremenljivko ukazne lupine, katere vrednost se lahko spremeni znotraj funkcij ukazne lupine."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Niz se sklicuje na spremenljivko ukazne lupine, katere vrednost se lahko "
+"spremeni znotraj funkcij ukazne lupine."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Niz se sklicuje na spremenljivko ukazne lupine s praznim imenom."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "V direktivi številka %u znak »%c« ni števka med 1 in 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Znak, ki zaključuje direktivo številka %u, ni števka med 1 in 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Izpis gostiteljskega imena računalnika.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Oblika izpisa:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           kratka oblika gostiteljskega imena\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long    dolga oblika gostiteljskega imena, vključno s polnim\n"
+"  -f, --fqdn, --long    dolga oblika gostiteljskega imena, vključno s "
+"polnim\n"
 "                          internetim imenom in vzdevki\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "gostiteljskega imena ni moč ugotoviti"
@@ -940,7 +1048,7 @@ msgstr "gostiteljskega imena ni moč ugotoviti"
 msgid "selector is not specified"
 msgstr "selektor ni podan"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "ni mogoče ustvariti konteksta XPath"
@@ -950,28 +1058,28 @@ msgstr "ni mogoče ustvariti konteksta XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "ni mogoče ovrednotiti izraza XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "vozlišče »%s« ne vsebuje »%s«"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "neveljavna vrednost prilastka »%s« za »%s«"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "Korenski element v imenskem prostoru %s ni »rules«"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "ni mogoče prebrati %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "lokacijske poti XPath ni mogoče ovrednotiti: %s"
@@ -991,28 +1099,28 @@ msgstr "ni mogoče prebrati datoteke XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "Krovni element ni »locatingRules«"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dovoljena je največ ena vhodna datoteka"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izključujeta"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1021,287 +1129,344 @@ msgstr ""
 "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 "in rokovanje z njimi.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Izbira vhodne datoteke:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+"IMENIKU\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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"
+msgstr ""
+"Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+"Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+"standardni\n"
 "izhod.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Izbira sporočil:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            obdržimo prevedena sporočila, zavržemo neprevedena\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            obdržimo prevedena sporočila, zavržemo "
+"neprevedena\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          obdržimo neprevedena sporočila, zavržemo prevedena\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          obdržimo neprevedena sporočila, zavržemo "
+"prevedena\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
+msgstr ""
+"      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
+msgstr ""
+"      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Rokovanje z določili:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
+msgstr ""
+"      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
+msgstr ""
+"      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
+msgstr ""
+"      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
-msgstr "      --previous              obdržimo prejšnja polja msgid prevedenih sporočil\n"
+msgstr ""
+"      --previous              obdržimo prejšnja polja msgid prevedenih "
+"sporočil\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        izbrišemo oznake \"previous msgid\" iz vseh sporočil\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        izbrišemo oznake \"previous msgid\" iz vseh "
+"sporočil\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 ob odstranitvi oznake »fuzzy« izbriši msgstr\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 ob odstranitvi oznake »fuzzy« izbriši msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, 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"
+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:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v DATOTEKI.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v DATOTEKI."
+"po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Skladnja vhodne datoteke:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      skladnja vhodne datoteke je javanska .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      skladnja vhodne datoteke je javanska ."
+"properties\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     skladnja vhodne datoteke je NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     skladnja vhodne datoteke je NeXTstep/GNUstep ."
+"strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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"
+"      --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:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, 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:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+"(privzeto)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                z ubežnimi sekvencami v skladnji C, brez\n"
 "                                razširjenega nabora znakov\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              vedno izpišemo datoteko PO, četudi prazno\n"
+msgstr ""
+"      --force-po              vedno izpišemo datoteko PO, četudi prazno\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, 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:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location       z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location       z vrsticami »#: datoteka:vrstica« v izpisu "
+"(privzeto)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict             izpis v strogi obliki Uniforum, brez razširitev "
+"GNU\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    zapiši NeXTstep/GNUstep datoteko .strings\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    zapiši NeXTstep/GNUstep datoteko .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1310,31 +1475,32 @@ msgstr ""
 "      --no-wrap               sporočil, daljših od širine strani, ne\n"
 "                              razlomi v več vrstic\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           izhod abecedno urejen po sporočilih\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
+msgstr ""
+"  -F, --sort-by-file         izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1356,41 +1522,46 @@ msgstr ""
 "ohranijo, razen če z izbiro --use-first ne zahtevamo, da se ohranijo samo\n"
 "tisti iz prve datoteke PO, ki jih definira.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
+msgstr ""
+"  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz "
+"DATOTEKE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, 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:409 src/msgcomm.c:400
+#: 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 ""
-"  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO definicij\n"
+"  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO "
+"definicij\n"
 "                                 (privzeta vrednost je neskončno)\n"
 
-#: src/msgcat.c:412
+#: 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 ""
-"  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+"  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+"definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1399,14 +1570,17 @@ msgstr ""
 "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
 "                                 enolično definirana sporočila\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      skladnja vhodnih datotek je javanska .properties\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      skladnja vhodnih datotek je javanska ."
+"properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1415,12 +1589,12 @@ msgstr ""
 "      --stringtable-input     skladnja vhodnih datotek je NeXTstep/GNUstep \n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1429,32 +1603,33 @@ msgstr ""
 "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 "                             naletimo; ne združujemo več prevodov\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOG          nastavi polje 'Language' v zaglavju\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "vhodni datoteki nista podani"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebni sta natančno dve vhodni datoteki"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1471,72 +1646,76 @@ msgstr ""
 "v programu.  Kadar ne najdemo natančnega ujemanja msgid, zaradi boljše\n"
 "diagnostike poskusimo z ohlapnim (fuzzy) algoritmom.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikatorji delovanja:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          ref.po uporabimo na vseh domenah iz def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          ref.po uporabimo na vseh domenah iz def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
+msgstr ""
+"      --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      obdržimo neprevedena sporočila\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "to sporočilo ni prevedeno"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "to sporočilo je uporabljeno, a ne definirano..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...a ta definicija je podobna"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporočilo ni uporabljeno"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1545,12 +1724,12 @@ msgstr[1] "%d kritična napaka"
 msgstr[2] "%d kritični napaki"
 msgstr[3] "%d kritične napake"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "podani morata biti vsaj dve datoteki"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1569,74 +1748,82 @@ msgstr ""
 "pri izvlačenju se ohranijo samo iz prve datoteke PO, ki jih definira. Položaji\n"
 "nizov v datotekah se ohranijo iz vseh datotek PO.\n"
 
-#: src/msgcomm.c:403
+#: 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 ""
-"  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+"  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+"definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr "      --omit-header           brez glave z vnosom »msgid \"\"«\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cilj pretvorbe:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, 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:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                izpis datoteke PO z zamiki\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: 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/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          z vrsticami »#: datoteka:vrstica« v izpisu "
+"(privzeto)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                izpis v strogi obliki Uniforum brez razširitev\n"
+msgstr ""
+"      --strict                izpis v strogi obliki Uniforum brez "
+"razširitev\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "zahtevana je natančno ena vhodna datoteka"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1649,22 +1836,22 @@ msgstr ""
 "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
 "msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "manjka ime ukaza"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] UKAZ [IZBIRA-UKAZA]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1678,7 +1865,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1687,47 +1874,47 @@ 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:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Ukazni vhod:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   dodaj znak NL na koncu vhoda\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "izpis na standardni izhod neuspešen"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "manjka ime filtra"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "podan mora biti vsaj en skript v sed"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1736,12 +1923,12 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Filtriraj vhod in izhod:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1750,46 +1937,55 @@ msgstr ""
 "  --newline                   dodaj znak NL na koncu vhodne vrstice in\n"
 "                                odstrani znak NL s konca izhodne vrstice"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
 "                                ki se izvedejo\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+"(privzeto)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header        ohrani glavo nespremenjeno, ne filtriraj je\n"
+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:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "izhod filtra ni zaključen z znakom NL"
@@ -1805,7 +2001,7 @@ msgid "invalid endianness: %s"
 msgstr "neveljaven vrstni red bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1814,14 +2010,14 @@ msgstr "Ulrich Drepper"
 msgid "no input file should be given if %s and %s are specified"
 msgstr "vhodna datoteka ne sme biti podana ob izbirah %s ali %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s zahteva določitev »-l locale«"
@@ -1841,7 +2037,7 @@ msgstr "%s zahteva določitev »-o datoteka«"
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s in %s se medsebojno izključujeta v %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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"
@@ -1851,19 +2047,19 @@ msgstr "%s je veljavno edino z %s ali %s"
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je veljavno edino z %s, %s ali %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "dostop do pravil ITS za %s ni možen"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1872,7 +2068,7 @@ msgstr[1] "%d prevedeno sporočilo"
 msgstr[2] "%d prevedeni sporočili"
 msgstr[3] "%d prevedena sporočila"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1881,7 +2077,7 @@ msgstr[1] ", %d ohlapni prevod"
 msgstr[2] ", %d ohlapna prevoda"
 msgstr[3] ", %d ohlapni prevodi"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1890,126 +2086,158 @@ msgstr[1] ", %d neprevedeno sporočilo"
 msgstr[2] ", %d neprevedeni sporočili"
 msgstr[3] ", %d neprevedena sporočila"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:910
 #, 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:934
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Način delovanja:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali več)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
+"več)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:935
 #, 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:949
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      način C#: ustvarimo .NET-datoteko z viri\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      način C#: ustvarimo .NET-datoteko z viri\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
+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:953
+#: src/msgfmt.c:941
 #, 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:955
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               način Desktop Entry: ustvarimo datoteko .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               način Desktop Entry: ustvarimo datoteko ."
+"desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   način XML: ustvari datoteko XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                izpis v strogi obliki Uniforum brez razširitev GNU\n"
+msgstr ""
+"      --strict                izpis v strogi obliki Uniforum brez razširitev "
+"GNU\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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"
+msgstr ""
+"Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                namesto datoteke .class izdelaj datoteko .java\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                namesto datoteke .class izdelaj datoteko ."
+"java\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s podčrtajem,\n"
-"pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapiše v podani\n"
+"Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s "
+"podčrtajem,\n"
+"pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapiše v "
+"podani\n"
 "imenik.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Položaj izhodne datoteke v načinu C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d IMENIK                   korenski imenik za krajevno odvisne datoteke .dll\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d IMENIK                   korenski imenik za krajevno odvisne datoteke ."
+"dll\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2018,39 +2246,41 @@ 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:997
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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:1003
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
+msgstr ""
+"Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Izbire načina Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=VZOREC           datoteka .desktop uporabljena kot vzorec\n"
+msgstr ""
+"  --template=VZOREC           datoteka .desktop uporabljena kot vzorec\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d IMENIK                   korenski imenik datotek .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2059,55 +2289,62 @@ msgstr ""
 "  -kBESEDA, --keyword=BESEDA  uporabi BESEDO kot dodatno ključo besedo\n"
 "  -k, --keyword[=BESEDA]      ne uporabljaj privzetih ključnih besed\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Izbire -l, -o in --template so obvezne. Če je določen -D, se vhodne datoteke\n"
+"Izbire -l, -o in --template so obvezne. Če je določen -D, se vhodne "
+"datoteke\n"
 "berejo iz navedenega imenika namesto iz argumentov ukazne vrstice.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Izbire načina XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=IME          prepoznaj navedeni jezik XML\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=VZOREC           datoteka XML uporabljena kot vzorec\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 opravimo vse preizkuse, določene z izbiramo\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          preverimo od jezika odvisne formatne nize\n"
+msgstr ""
+"      --check-format          preverimo od jezika odvisne formatne nize\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr "      --check-header          preverimo obstoj in vsebino glave\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2116,132 +2353,142 @@ msgstr ""
 "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
 "                                domene in izbiro --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 "                                menujske izbire\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
+msgstr ""
+"  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov (privzeto %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov "
+"(privzeto %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=VRSTNI_RED zapiši 32-bitna števila v podanem vrstnem redu\n"
-"                                bajtov (big ali little, odvisno od strojnega\n"
+"      --endianness=VRSTNI_RED zapiši 32-bitna števila v podanem vrstnem "
+"redu\n"
+"                                bajtov (big ali little, odvisno od "
+"strojnega\n"
 "                                okolja)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               binarni katalog sporočil bo brez razpršene tabele\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               binarni katalog sporočil bo brez razpršene "
+"tabele\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            s statistiko glede prevodov\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 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:1199
+#: src/msgfmt.c:1185
 #, 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:1202
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:1212
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
-
-#: src/msgfmt.c:1214
-#, 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:1238
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1216
 #, 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:1257
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktiva »domain %s« ni bila upoštevana"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prazno polje »msgstr« ni bilo upoštevano"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ne obstaja"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s obstaja, vendar se ne da prebrati"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, 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«"
+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«"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2250,7 +2497,7 @@ msgstr ""
 "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
 "pripadajo dani izvorni datoteki.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2331,34 +2578,42 @@ msgstr ""
 "  -v, --invert-match          izpiši le sporočila, ki ne ustrezajo nobenemu\n"
 "                              od podanih kriterijev\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 "                             razširjenega nabora znakov\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, 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:298
+msgstr ""
+"      --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
+
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Nimate nastavljenega jezikovnega okolja. Prosim, nastavite\n"
 "spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n"
 "Brez tega ne morete preizkusiti vaših prevodov.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2369,12 +2624,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:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Ustvarjena datoteka %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2383,26 +2638,28 @@ msgstr ""
 "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n"
 "uporabnikovega jezikovnega okolja.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka POT\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Če vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem imeniku.\n"
+"Če vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem "
+"imeniku.\n"
 "Če je enaka -, se bere standardni vhod.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2412,17 +2669,21 @@ msgstr ""
 "nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna datoteka \n"
 "podan -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=JJ_DD          določitev ciljnega jezikovnega okolja\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         privzamemo, da je datoteka PO samodejno ustvarjena\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         privzamemo, da je datoteka PO samodejno "
+"ustvarjena\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2430,12 +2691,12 @@ msgstr ""
 "Našli smo več kot eno datoteko .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "napaka pri branju trenutnega imenika"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2443,17 +2704,19 @@ msgstr ""
 "V trenutnem imeniku ni najti nobene datoteke .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s neuspešen z izhodno kodo %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Novi katalog sporočil naj vsebuje vaš epoštni naslov, tako da se lahko\n"
@@ -2463,64 +2726,72 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenski prevodi paketa %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+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:208
+#: 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 "domena \"%s\" v vhodni datoteki »%s« ne vsebuje glave z določitvijo nabora znakov"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domena \"%s\" v vhodni datoteki »%s« ne vsebuje glave z določitvijo nabora "
+"znakov"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med drugim UTF8.\n"
+"Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med drugim "
+"UTF8.\n"
 "Izhod je pretvorjen v UTF8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2530,10 +2801,12 @@ msgid ""
 msgstr ""
 "Pretvorba datoteke %s iz nabora znakov %s v nabor %s\n"
 "spremeni nekatere nize msgid in msgctxt.\n"
-"Bodisi spremenite vse nize msgid in msgctxt v čisti ASCII, ali pa zagotovite, da\n"
-"so kodirani skladno z UTF-8 od samega začetka, torej v datotekah z izvorno kodo.\n"
+"Bodisi spremenite vse nize msgid in msgctxt v čisti ASCII, ali pa "
+"zagotovite, da\n"
+"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:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2546,12 +2819,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:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2562,7 +2835,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:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2575,7 +2848,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:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2586,55 +2859,58 @@ 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:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, 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"
+msgstr ""
+"nplurals = %lu, izraz za izbiro množinske oblike pa lahko da vrednosti do %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 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:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "izraz za izbiro množinske oblike lahko povzroči prekoračitev obsega"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr ""
 "izraz za izbiro množinske oblike lahko povzroči aritmetične napake, morda\n"
 "deljenje z nič"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Poskusite uporabiti naslednje, veljavno za %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalog sporočil vsebuje množinske oblike prevodov,"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "v glavi pa manjka določilo \"plural=IZRAZ\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "v glavi pa manjka določilo \"nplurals=ŠTEVILO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "neveljavna vrednost nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "neveljaven izraz za množinske oblike"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
@@ -2644,7 +2920,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:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2658,7 +2934,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:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2667,8 +2943,10 @@ 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:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 "katalog sporočil vsebuje množinske oblike, manjka pa glava z določili\n"
 "\"Plural-Forms: nplurals=ŠTEVILO; plural=IZRAZ;\""
@@ -2677,7 +2955,7 @@ msgstr ""
 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:624
+#: src/msgl-check.c:623
 #, 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«"
@@ -2690,7 +2968,7 @@ msgstr "polji »msgid« in »msgstr« se ne začneta obe z »\\n«"
 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:665
+#: src/msgl-check.c:664
 #, 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«"
@@ -2703,83 +2981,100 @@ msgstr "polji »msgid« in »msgstr« se ne končata obe z »\\n«"
 msgid "plural handling is a GNU gettext extension"
 msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bližnjice »%c«"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveč oznak bližnjic »%c«"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "polje »%s« v glavi ima še vedno začetne privzete vrednosti\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "v glavi manjka polje »%s«\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "tripičje ASCII ('...') namesto unikoda"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "v uporabniškem vidnem nizu najden presledek pred tripičjem"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "dvojni narekovaj ASCII uporabljen namesto unikoda"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "enojni narekovaj ASCII uporabljen namesto unikoda"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "sredinska pika ASCII ('%c') namesto unikoda"
+
+#: 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:70
+#: 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:291
+#: src/msgl-iconv.c:288
 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:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), ta pa ne podpira te pretvorbe."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), ta pa ne podpira te "
+"pretvorbe."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri različni ključi msgid postanejo enaki."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri različni ključi "
+"msgid postanejo enaki."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()."
+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()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je veljavno edino z %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "vrsta varnostne kopije"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2802,26 +3097,27 @@ 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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; navedemo\n"
+"  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; "
+"navedemo\n"
 "                                lahko več kot eno\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2830,30 +3126,33 @@ msgstr ""
 "  -U, --update                posodobi def.po,\n"
 "                                če je def.po že posodobljen, ne stori nič\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
+msgstr ""
+"      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
+msgstr ""
+"  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2868,108 +3167,134 @@ msgstr ""
 "                  sicer enostavne\n"
 "  simple, never   vedno enostavne varnostne kopije\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Varnostna kopija ima pripono »~«, razen če ni z izbiro --suffix ali\n"
 "spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugače. \n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              obdržimo prejšnja polja msgid prevedenih sporočil\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              obdržimo prejšnja polja msgid prevedenih "
+"sporočil\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       brez kazalnika poteka\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, 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:1650
+#: src/msgmerge.c:1706
 #, 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:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, manjkajočih %ld, opuščenih %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, "
+"manjkajočih %ld, opuščenih %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " opravljeno.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Pretvorba kataloga sporočil iz binarne oblike .mo v obliko Uniforum .po.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      način virov C#: vhod je .NET-datoteka .resources\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      način virov C#: vhod je .NET-datoteka ."
+"resources\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+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:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DATOTEKA ...                datoteka MO (ali več datotek MO)\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s podčrtajem,\n"
+"Ime razreda je sestavljeno iz imena sredstva, ki se mu, ločeno s "
+"podčrtajem,\n"
 "pridá ime jezikovnega okolja. Razred je določen s spremenljivko CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: 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:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2978,29 +3303,31 @@ 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:480
+#: 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:486
+#: 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 "Izbiri -l in -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
+msgstr ""
+"Izbiri -l in -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgunfmt.c:512
+#: 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:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
+msgstr ""
+"      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3021,19 +3348,21 @@ 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:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 izpišemo le podvojena sporočila\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "  -u, --unique                   vsako sporočilo izpišemo le enkrat,\n"
 "                                   dvojnike zavržemo\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3094,27 +3423,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "neskladna raba #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "manjkajoč razdelek »msgstr[]«"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "manjkajoč razdelek »msgid_plural«"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "manjkajoč razdelek »msgstr«"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prva množinska oblika ima indeks različen od nič"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množinska oblika ima napačen indeks"
@@ -3124,7 +3453,7 @@ msgstr "množinska oblika ima napačen indeks"
 msgid "too many errors, aborting"
 msgstr "preveč napak, nadaljevanje ni možno"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neveljavno večzložno zaporedje"
@@ -3134,41 +3463,41 @@ msgstr "neveljavno večzložno zaporedje"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nepopolno večzložno zaporedje na koncu datoteke"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nepopolno večzložno zaporedje na koncu vrstice"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv neuspešen"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ključna beseda \"%s\" neprepoznana"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "neveljavno krmilno zaporedje"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "znak za konec datoteke sredi niza"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "znak za konec vrstice sredi niza"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
@@ -3189,48 +3518,64 @@ msgstr "nezaključeno ime skupine"
 msgid "invalid non-blank character"
 msgstr "neveljaven nepresledni znak"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "manjka »=« za »%s«"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "neveljavna nepresledna vrstica"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "datoteka \"%s\" je okrnjena"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "datoteka \"%s\" vsebuje niz, ki ni zaključen z NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "datoteka \"%s\" vsebuje sistemski segment, ki ni zaključen z NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "datoteka \"%s\" ni v obliki GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "datoteka \"%s\" vsebuje pri %s niz, ki ni zaključen z NUL"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "opozorilo: neveljavna skladnja \\uxxxx za unikodni znak"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: opozorilo: osamljen surogat U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "opozorilo: neveljavni unikodni znak"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "opozorilo: nezaključen niz"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "opozorilo: napaka v skladnji"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "opozorilo: nezaključen par ključ/vrednost"
 
@@ -3238,11 +3583,11 @@ msgstr "opozorilo: nezaključen par ključ/vrednost"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "opozorilo: napaka v skladnji, za nizom pričakovan »;«"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "opozorilo: napaka v skladnji, za nizom pričakovan »=« ali »;«"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Avtorja %s in %s.\n"
@@ -3251,16 +3596,16 @@ msgstr "Avtorja %s in %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Pretvori besedilo v srbščini iz cirilice v latinico.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3269,27 +3614,27 @@ msgstr ""
 "Vhodno besedilo se bere s standardnega vhoda. Pretvorjeno besedilo se zapisuje\n"
 "na standardni izhod.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "vhod ni veljaven v naboru znakov »%s«"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "napaka pri pretvorbi iz nabora znakov \"%s\" v nabor \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "pričakujemo dva argumenta"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uporaba: %s [IZBIRA] URL DATOTEKA\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3298,111 +3643,137 @@ msgstr ""
 "Prinese in izpiše vsebino podanega URL. Če URL ni dosegljiv, se uporabni\n"
 "krajevno dostopna DATOTEKA.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "napaka pri branju »%s«"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "napaka pri pisanju na standardni izhod"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "napaka po branju »%s«"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Pridobivamo %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " pretečeno.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " ni uspelo.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "V izbranem izhodnem zapisu ni mogoče zapisati več domen prevodov kot eno datoteko. Poskusite uporabiti skladnjo PO."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"V izbranem izhodnem zapisu ni mogoče zapisati več domen prevodov kot eno "
+"datoteko. Poskusite uporabiti skladnjo PO."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "V izbranem izhodnem zapisu ni mogoče zapisati več domen prevodov kot eno datoteko."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"V izbranem izhodnem zapisu ni mogoče zapisati več domen prevodov kot eno "
+"datoteko."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "katalog sporočil vsebuje od konteksta odvisne prevode, izbrani izhodni zapis pa jih ne podpira"
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"katalog sporočil vsebuje od konteksta odvisne prevode, izbrani izhodni zapis "
+"pa jih ne podpira"
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne podpira. Poskusite namesto datoteke .properties ustvariti javanski razred z \"msgfmt --java\"."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne "
+"podpira. Poskusite namesto datoteke .properties ustvariti javanski razred z "
+"\"msgfmt --java\"."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne podpira"
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne "
+"podpira"
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "izhodne datoteke \"%s\" ni mogoče ustvariti"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standardni izhod"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "ustvarjanje imenika »%s« neuspešno"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "prevajanje razreda C# neuspešno"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ni veljavno javansko ime razreda: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite "
+"$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "nepopolno večbajtno zaporedje"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence »\\%c«"
+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:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3411,11 +3782,12 @@ msgid ""
 "%s\n"
 msgstr ""
 "Naslednji msgctxt vsebuje znake, ki niso del nabora ASCII.\n"
-"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov kot\n"
+"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov "
+"kot\n"
 "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3423,8 +3795,10 @@ msgid ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora ASCII.\n"
-"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov kot\n"
+"Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora "
+"ASCII.\n"
+"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov "
+"kot\n"
 "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 "%s\n"
 
@@ -3438,11 +3812,13 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
-"katalog sporočil obsega nize msgxtxt, ki vsebujejo znake izven nabora ISO 8859-1,\n"
+"katalog sporočil obsega nize msgxtxt, ki vsebujejo znake izven nabora ISO "
+"8859-1,\n"
 "katalog sporočil Qt pa podpira ISO 10646/Unicode le v prevedenih nizih, v\n"
 "izvirnikih pa ne\n"
 
@@ -3456,12 +3832,12 @@ msgstr ""
 "katalog sporočil Qt pa podpira ISO 10646/Unicode le v prevedenih nizih, v\n"
 "izvirnikih pa ne\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "napaka pri pisanju v podproces %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3469,7 +3845,7 @@ msgstr ""
 "katalog sporočil vsebuje od konteksta odvisne prevode\n"
 " vendar zapis virov C# ne podpira kontekstov\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3477,7 +3853,7 @@ msgstr ""
 "katalog sporočil vsebuje množinske oblike, vendar zapis virov C#\n"
 "ne podpira množinskih oblik\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3485,7 +3861,7 @@ msgstr ""
 "katalog sporočil vsebuje od konteksta odvisne prevode,\n"
 "vendar katalog sporočil TCL ne podpira kontekstov\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3493,36 +3869,56 @@ 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-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: opozorilo: nezaključen regularni izraz"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "opozorilo: neveljavni unikodni znak"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: opozorilo: nezaključen niz"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: opozorilo: nezaključen niz"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3531,7 +3927,7 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3540,7 +3936,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:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3549,7 +3945,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:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3558,12 +3954,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:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: napaka v iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3572,119 +3968,145 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: opozorilo: nezaključen konstanten nit"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zaklepaj »}«"
+msgstr ""
+"%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zaklepaj »}«"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
+msgstr ""
+"%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "»%s« ni veljavno ime kodiranja. Namesto tega bo uporabljen ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "preverba skladnje »%s« ni poznana"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "neznan tip konca stavka »%s«"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:701
 #, 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:716
+#: src/xgettext.c:705
 #, 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:868
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "opozorilo: datoteka »%s« s pravili ITS ne obstaja"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "opozorilo: datoteka »%s« s pravili ITS ne obstaja; preverite svojo namestitev gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"opozorilo: datoteka »%s« s pravili ITS ne obstaja; preverite svojo "
+"namestitev gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:938
 #, 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:1052
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
+msgstr ""
+"  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1054
 #, 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"
+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:1084
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:1086
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=JEZIK           obravnavaj vhodno datoteko v danem JEZIKU\n"
 "                                   (C, C++, predmetni C, PO, ukazna lupina,\n"
-"                                   python, lisp, emacs lisp, librep, scheme,\n"
-"                                   smalltalk, java, JavaProperties, C#, awk,\n"
-"                                   YCP, TCL, perl, PHP, GCC-vir, NXStringTable,\n"
-"                                   RST, glade, lua, javascript, vala, desktop)\n"
+"                                   python, lisp, emacs lisp, librep, "
+"scheme,\n"
+"                                   smalltalk, java, JavaProperties, C#, "
+"awk,\n"
+"                                   YCP, TCL, perl, PHP, GCC-vir, "
+"NXStringTable,\n"
+"                                   RST, glade, lua, javascript, vala, "
+"desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   okrajšava za --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+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:1100
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3693,27 +4115,29 @@ msgstr ""
 "      --from-code=NABOR       nabor znakov vhodnih datotek\n"
 "                                (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1078
 #, 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:1108
+#: src/xgettext.c:1083
 #, 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:1110
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=DATOTEKA.po  vnosov iz navedene DATOTEKE ne izvlečemo\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cZNAČKA, --add-comments=ZNAČKA  postavi v izhodno datoteko bloke\n"
@@ -3722,18 +4146,18 @@ msgstr ""
 "  -c, --add-comments          postavi vse komentarje pred vrsticami s \n"
 "                                ključnimi besedami v izhodno datoteko\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=IME             izvedi preverjanje skladnje na sporočilih\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3743,238 +4167,200 @@ msgstr ""
 "      --sentence-end=TIP      tip konca stavka (single-space, kar je\n"
 "                                privzeta vrednost, ali double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifične za jezik:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           iz datotek potegnemo vse nize\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (samo jeziki C, C++, predmetni C, ukazna lupina,\n"
-"                                python, lisp, emacs lisp, librep, scheme, java,\n"
-"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, lua,\n"
+"                                (samo jeziki C, C++, predmetni C, ukazna "
+"lupina,\n"
+"                                python, lisp, emacs lisp, librep, scheme, "
+"java,\n"
+"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, "
+"lua,\n"
 "                                javascript, vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
-"                                (samo jeziki C, C++, predmetni C, ukazna lupina,\n"
-"                                python, lisp, emacs lisp, librep, scheme, java,\n"
-"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, lua,\n"
+"                                (samo jeziki C, C++, predmetni C, ukazna "
+"lupina,\n"
+"                                python, lisp, emacs lisp, librep, scheme, "
+"java,\n"
+"                                C#, awk, TCL, perl, PHP, GCC-vir, glade, "
+"lua,\n"
 "                                javascript, vala, desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=BESEDA:ARG:STIKALO  dodatno stikalo za nize znotraj argumenta\n"
 "                                 številka ARG ključne besede BESEDA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                                (samo jeziki C, C++, predmetni C, ukazna lupina,\n"
-"                                python, lisp, emacs lisp, librep, scheme, java,\n"
+"                                (samo jeziki C, C++, predmetni C, ukazna "
+"lupina,\n"
+"                                python, lisp, emacs lisp, librep, scheme, "
+"java,\n"
 "                                C#, awk, YCP, TCL, perl, PHP, GCC-vir, lua,\n"
 "                                javascript, vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1126
 #, 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:1153
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (samo jeziki C, C++ in predmetni C)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=DATOTEKA          izvedi pravila ITS iz DATOTEKE\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (samo jeziki, osnovani na XML)\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (samo jezik C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   prepoznaj oblikovne nize KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                    bolj razčlenjen rezultat razpoznave\n"
 "                                   oblikovnega niza\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=DATOTEKA          izvedi pravila ITS iz DATOTEKE\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               izpiši komentarje itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1188
 #, 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"
+msgstr ""
+"      --copyright-holder=NIZ     v izhodu nastavimo nosilca avtorskih pravic "
+"na NIZ\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          brez copyrighta FSF v izpisu za tuje uporabnike\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          brez copyrighta FSF v izpisu za tuje "
+"uporabnike\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1192
 #, 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:1217
+#: src/xgettext.c:1194
 #, 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:1219
-#, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah msgid\n"
+msgstr ""
+"      --package-version=NIZ      v izhodu nastavimo različico paketa na NIZ\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za msgstr\n"
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah "
+"msgid\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
-msgstr "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
-
-#: src/xgettext.c:2050
-#, c-format
-msgid "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:2175
-msgid "standard input"
-msgstr "standardni vhod"
-
-#: src/xgettext.c:2340
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Ne-ASCII znak pri %s%s."
-
-#: src/xgettext.c:2344
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Ne-ASCII komentar pri ali okoli %s%s."
-
-#: src/xgettext.c:2349
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Ne-ASCII niz pri %s%s."
-
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: opozorilo: "
-
-#: src/xgettext.c:2458
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz %s. Razlog: %s\n"
-
-#: src/xgettext.c:2459
-#, c-format
-msgid "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"
+msgstr ""
+"  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za "
+"msgstr\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
-"Oblikovnega niza »%s« z nepoimenovanimi argumenti ni mogoče pravilno\n"
-"lokalizirati. Prevajalec ne more spremeniti vrstnega reda argumentov.\n"
-"Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
-"ter preslikave namesto n-terčka argumentov.\n"
+"  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:1597
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Prazen msgid. Ta vnos je rezerviran za GNU gettext:\n"
-"gettext(\"\") vrne glavo z metapodatki, ne pa\n"
-"praznega niza.\n"
-
-#: src/xgettext.c:3292
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "dvoumno določen argument za ključno besede »%.*s«"
-
-#: src/xgettext.c:3319
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
-
-#: src/xgettext.c:3344
-#, 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«"
+"Argument --flag nima skladnje <ključna-beseda>:<št-arg>:[pass-]<stikalo>: %s"
 
-#: src/xgettext.c:3365
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "standardni vhod"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3986,21 +4372,16 @@ msgstr ""
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jezik »%s« ni poznan"
 
-#: 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-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4009,7 +4390,7 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4018,7 +4399,7 @@ msgstr ""
 "%s:%d: Nepopolno dolgo večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4027,7 +4408,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-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4036,7 +4417,7 @@ 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-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4045,145 +4426,202 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: opozorilo: RegExp literal prekinjen predčasno"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: opozorilo: %s ni dovoljen"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: opozorilo: nezaključena značka XML"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: neveljavna interpolacija spremenljivke pri »%c«"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:325
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:342
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nepopolno dolgo večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:355
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nezaključeno večbajtno zaporedje na koncu datoteke.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:365
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Nezaključeno večbajtno zaporedje na koncu vrstice.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
 #: src/x-python.c:398
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s komentarjem,\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code ali s "
+"komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:654
 #, 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:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neveljavna definicija niza"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: za # manjka številka"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: niz ni veljaven izraz"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: neveljavna definicija niza"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: neveljavna definicija niza"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, uporabite raje eval_gettext"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, "
+"uporabite raje eval_gettext"
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: opozorilo: regularni izraz prekinjen predčasno"
@@ -4314,6 +4752,104 @@ msgstr "znotraj komentarja ali navodil za obdelavo"
 msgid "document ended unexpectedly: %s"
 msgstr "dokument se je nepričakovano končal: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: neprepoznana izbira »--%s«\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: izbira »-W %s« ni enopomenska\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: izbira »-W %s« zahteva argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Ne-ASCII znak pri %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Ne-ASCII komentar pri ali okoli %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Ne-ASCII niz pri %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: opozorilo: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni "
+#~ "niz %s. Razlog: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Oblikovnega niza »%s« z nepoimenovanimi argumenti ni mogoče pravilno\n"
+#~ "lokalizirati. Prevajalec ne more spremeniti vrstnega reda argumentov.\n"
+#~ "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
+#~ "ter preslikave namesto n-terčka argumentov.\n"
+
+#~ 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 ""
+#~ "Prazen msgid. Ta vnos je rezerviran za GNU gettext:\n"
+#~ "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
+#~ "praznega niza.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "dvoumno določen argument za ključno besede »%.*s«"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
+
+#, 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«"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
+
 #~ msgid "Missing context for the string extracted from '%s' element"
 #~ msgstr "Manjkajoči kontekst za niz, izvlečen iz elementa »%s«"
 
@@ -4350,8 +4886,10 @@ msgstr "dokument se je nepričakovano končal: %s"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "To je prost program; pogoji, pod katerimi ga lahko razmnožujete in\n"
@@ -4405,8 +4943,10 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid "Invalid email address: invalid character."
 #~ msgstr "Neveljaven epoštni naslov: neveljaven znak."
 
-#~ msgid "Invalid email address: need a fully qualified host name or domain name."
-#~ msgstr "Neveljaven epoštni naslov: potrebujemo polno ime gostitelja ali domene."
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr ""
+#~ "Neveljaven epoštni naslov: potrebujemo polno ime gostitelja ali domene."
 
 #~ msgid "Invalid email address: missing @"
 #~ msgstr "Neveljaven epoštni naslov: manjkajoč @"
@@ -4415,7 +4955,8 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgstr "Je to vaš epoštni naslov?"
 
 #~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr "Prosimo, potrdite s pritiskom na Enter, ali vnesite vaš epoštni naslov."
+#~ msgstr ""
+#~ "Prosimo, potrdite s pritiskom na Enter, ali vnesite vaš epoštni naslov."
 
 #~ msgid "Couldn't find out about your email address."
 #~ msgstr "Vašega epoštnega naslova ni moč ugotoviti."
@@ -4429,39 +4970,49 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE      write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+#~ "standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
-#~ "      --translated            keep translated, remove untranslated messages\n"
-#~ "      --untranslated          keep untranslated, remove translated messages\n"
+#~ "      --translated            keep translated, remove untranslated "
+#~ "messages\n"
+#~ "      --untranslated          keep untranslated, remove translated "
+#~ "messages\n"
 #~ "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 #~ "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 #~ "      --no-obsolete           remove obsolete #~ messages\n"
 #~ "      --only-obsolete         keep obsolete #~ messages\n"
 #~ msgstr ""
 #~ "Izbira sporočil:\n"
-#~ "      --translated            obdržimo prevedena sporočila, zavržemo neprevedena\n"
-#~ "      --untranslated          obdržimo neprevedena sporočila, zavržemo prevedena\n"
-#~ "      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
-#~ "      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
+#~ "      --translated            obdržimo prevedena sporočila, zavržemo "
+#~ "neprevedena\n"
+#~ "      --untranslated          obdržimo neprevedena sporočila, zavržemo "
+#~ "prevedena\n"
+#~ "      --no-fuzzy              brez ohlapnih samodejno prevedenih "
+#~ "sporočil\n"
+#~ "      --only-fuzzy            zgolj ohlapna samodejno prevedena "
+#~ "sporočila\n"
 #~ "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 #~ "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
@@ -4472,17 +5023,22 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "      --set-obsolete          set all messages obsolete\n"
 #~ "      --clear-obsolete        set all messages non-obsolete\n"
 #~ "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-#~ "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+#~ "      --ignore-file=FILE.po   manipulate only entries not listed in FILE."
+#~ "po\n"
 #~ "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-#~ "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+#~ "      --obsolete              synonym for --only-obsolete --clear-"
+#~ "obsolete\n"
 #~ msgstr ""
 #~ "Rokovanje z določili:\n"
-#~ "      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
+#~ "      --set-fuzzy             vsa sporočila označimo kot ohlapno "
+#~ "pprevedena\n"
 #~ "      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
 #~ "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
-#~ "      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
+#~ "      --clear-obsolete        izbrišemo vse oznake o zastarelosti "
+#~ "prevodov\n"
 #~ "      --only-file=DATOTEKA.po  obdelamo le vnose, navedene v DATOTEKI.po\n"
-#~ "      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v DATOTEKI.po\n"
+#~ "      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v "
+#~ "DATOTEKI.po\n"
 #~ "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 #~ "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
@@ -4493,23 +5049,29 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                write the .po file using indented style\n"
 #~ "      --no-location           do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-#~ "      --strict                write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location          generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4519,58 +5081,76 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "Input file location:\n"
 #~ "  INPUTFILE ...                  input files\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
-#~ "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz DATOTEKE\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih "
+#~ "datotek)\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz "
+#~ "DATOTEKE\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
 #~ "  -o, --output-file=FILE         write output to specified file\n"
-#~ "The results are written to standard output if no output file is specified\n"
+#~ "The results are written to standard output if no output file is "
+#~ "specified\n"
 #~ "or if it is -.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
+#~ "Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na "
+#~ "standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 0 if not set\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO definicij\n"
+#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je neskončno)\n"
-#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je 1)\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo "
+#~ "samo\n"
 #~ "                                 enolično definirana sporočila\n"
 
 #~ msgid ""
 #~ "Output details:\n"
 #~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for each\n"
-#~ "                                 message, don't merge several translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --use-first                use first available translation for "
+#~ "each\n"
+#~ "                                 message, don't merge several "
+#~ "translations\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
@@ -4578,14 +5158,17 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 #~ "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 #~ "                             naletimo; ne združujemo več prevodov\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4604,17 +5187,20 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "Input file location:\n"
 #~ "  def.po                      translations\n"
 #~ "  ref.pot                     references to the sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ msgstr ""
 #~ "Izbira vhodnih datotek:\n"
 #~ "  def.po                      prevodi\n"
 #~ "  ref.pot                     sklici na vire\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 
 #~ msgid ""
 #~ "Message selection:\n"
 #~ "  -<, --less-than=NUMBER         print messages with less than this many\n"
-#~ "                                 definitions, defaults to infinite if not\n"
+#~ "                                 definitions, defaults to infinite if "
+#~ "not\n"
 #~ "                                 set\n"
 #~ "  ->, --more-than=NUMBER         print messages with more than this many\n"
 #~ "                                 definitions, defaults to 1 if not set\n"
@@ -4622,38 +5208,51 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Izbira sporočil:\n"
-#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO definicij\n"
+#~ "  -<, --less-than=ŠTEVILO        izpiši sporočila z manj kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je neskončno)\n"
-#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO definicij\n"
+#~ "  ->, --more-than=ŠTEVILO        izpiši sporočila z več kot ŠTEVILO "
+#~ "definicij\n"
 #~ "                                 (privzeta vrednost je 1)\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, izpišemo "
+#~ "samo\n"
 #~ "                                 enolično definirana sporočila\n"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4667,23 +5266,28 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "  -i, --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4692,35 +5296,42 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  INPUTFILE                   input PO or POT file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  -i, --input=INPUTFILE       input PO file\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If no input file is given or if it is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 #~ "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+#~ "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+#~ "commands\n"
 #~ "                                to be executed\n"
-#~ "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+#~ "  -n, --quiet, --silent       suppress automatic printing of pattern "
+#~ "space\n"
 #~ msgstr ""
 #~ "Uporabne IZBIRE FILTRA, kadar je FILTER ,sed`:\n"
 #~ "  -e, --expression=SKRIPT     dodaj SKRIPT med ukaze, ki se izvedejo\n"
-#~ "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
+#~ "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med "
+#~ "ukaze,\n"
 #~ "                                ki se izvedejo\n"
 #~ "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
@@ -4730,25 +5341,31 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "  -E, --escape                use C escapes in output, no extended chars\n"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter it\n"
+#~ "      --keep-header           keep header entry unmodified, don't filter "
+#~ "it\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "  -s, --sort-output           generate sorted output\n"
 #~ "  -F, --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "      --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4757,25 +5374,31 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "Input file location:\n"
 #~ "  filename.po ...             input files\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
 #~ "If input file is -, standard input is read.\n"
 #~ msgstr ""
 #~ "Izbira vhodne datoteke:\n"
 #~ "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
 #~ "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
 #~ msgid ""
 #~ "Operation mode:\n"
-#~ "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+#~ "  -j, --java                  Java mode: generate a Java ResourceBundle "
+#~ "class\n"
+#~ "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+#~ "higher)\n"
 #~ "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 #~ msgstr ""
 #~ "Način delovanja:\n"
 #~ "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 #~ "                                ResourceBundle\n"
-#~ "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali več)\n"
-#~ "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
+#~ "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
+#~ "več)\n"
+#~ "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat ."
+#~ "msg\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
@@ -4785,12 +5408,14 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
 #~ "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "      --strict                izpis v strogi obliki Uniforum brez razširitev GNU\n"
+#~ "      --strict                izpis v strogi obliki Uniforum brez "
+#~ "razširitev GNU\n"
 #~ "Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
 
 #~ msgid ""
 #~ "Output file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE         locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY                base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is written in the\n"
 #~ "specified directory.\n"
@@ -4803,27 +5428,37 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "Input file interpretation:\n"
 #~ "  -c, --check                 perform all the checks implied by\n"
-#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          check language dependent format strings\n"
-#~ "      --check-header          verify presence and contents of the header entry\n"
-#~ "      --check-domain          check for conflicts between domain directives\n"
+#~ "      --check-header          verify presence and contents of the header "
+#~ "entry\n"
+#~ "      --check-domain          check for conflicts between domain "
+#~ "directives\n"
 #~ "                                and the --output-file option\n"
-#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-#~ "      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+#~ "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ "      --check-accelerators[=CHAR]  check presence of keyboard "
+#~ "accelerators for\n"
 #~ "                                menu items\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ msgstr ""
 #~ "Interpretacija vhodne datoteke:\n"
-#~ "  -c, --check                 opravimo vse preizkuse, določene z izbiramo\n"
-#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "  -c, --check                 opravimo vse preizkuse, določene z "
+#~ "izbiramo\n"
+#~ "                                --check-format, --check-header, --check-"
+#~ "domain\n"
 #~ "      --check-format          preverimo od jezika odvisne formatne nize\n"
 #~ "      --check-header          preverimo obstoj in vsebino glave\n"
-#~ "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
+#~ "      --check-domain          preverimo morebitna nesoglasja med "
+#~ "direktivo\n"
 #~ "                                domene in izbiro --output-file\n"
-#~ "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open msgfmt\n"
+#~ "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
+#~ "msgfmt\n"
 #~ "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 #~ "                                menujske izbire\n"
-#~ "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
+#~ "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene "
+#~ "prevode\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -4845,23 +5480,28 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "      --force-po              write PO file even if empty\n"
 #~ "      --indent                indented output style\n"
 #~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines (default)\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
 #~ "      --strict                strict Uniforum output style\n"
 #~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer than\n"
+#~ "      --no-wrap               do not break long message lines, longer "
+#~ "than\n"
 #~ "                              the output page width, into several lines\n"
 #~ "      --sort-output           generate sorted output\n"
 #~ "      --sort-by-file          sort output by file location\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "      --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "      --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "      --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "      --sort-output        izhod abecedno urejen po sporočilih\n"
@@ -4871,20 +5511,25 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "Input file location:\n"
 #~ "  def.po                      translations referring to old sources\n"
 #~ "  ref.pot                     references to new sources\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-#~ "  -C, --compendium=FILE       additional library of message translations,\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -C, --compendium=FILE       additional library of message "
+#~ "translations,\n"
 #~ "                              may be specified more than once\n"
 #~ msgstr ""
 #~ "Izbira vhodnih datotek:\n"
 #~ "  def.po                      prevodi\n"
 #~ "  ref.pot                     sklici na vire\n"
-#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
-#~ "  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; navedemo\n"
+#~ "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
+#~ "IMENIKU\n"
+#~ "  -C, --compendium=DATOTEKA   dodatna knjižnica s prevodi sporočil; "
+#~ "navedemo\n"
 #~ "                                lahko več kot eno\n"
 
 #~ msgid ""
 #~ "Operation modifiers:\n"
-#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+#~ "  -m, --multi-domain          apply ref.pot to each of the domains in def."
+#~ "po\n"
 #~ "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 #~ msgstr ""
 #~ "Modifikatorji delovanja:\n"
@@ -4906,7 +5551,8 @@ msgstr "dokument se je nepričakovano končal: %s"
 
 #~ msgid ""
 #~ "Input file location in Tcl mode:\n"
-#~ "  -l, --locale=LOCALE      locale name, either language or language_COUNTRY\n"
+#~ "  -l, --locale=LOCALE      locale name, either language or "
+#~ "language_COUNTRY\n"
 #~ "  -d DIRECTORY             base directory of .msg message catalogs\n"
 #~ "The -l and -d options are mandatory.  The .msg file is located in the\n"
 #~ "specified directory.\n"
@@ -4934,7 +5580,8 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "                           nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        abecedno urejen izpis\n"
@@ -4952,29 +5599,37 @@ msgstr "dokument se je nepričakovano končal: %s"
 
 #~ msgid ""
 #~ "Output file location:\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
 #~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
 #~ "Izbira izhodne datoteke:\n"
-#~ "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
+#~ "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA."
+#~ "po\n"
 #~ "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
-#~ "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni IMENIK\n"
+#~ "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni "
+#~ "IMENIK\n"
 #~ "Če je kot izhodna datoteka navedeno -, se rezultat izpiše na standardni\n"
 #~ "izhod.\n"
 
 #~ msgid ""
 #~ "Language=C/C++ specific options:\n"
 #~ "  -a, --extract-all              extract all strings\n"
-#~ "  -k, --keyword[=WORD]           additional keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additional keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
-#~ "      --debug                    more detailed formatstring recognition result\n"
+#~ "      --debug                    more detailed formatstring recognition "
+#~ "result\n"
 #~ msgstr ""
 #~ "  -a, --extract-all              iz datotek potegnemo vse nize\n"
-#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah (prazen\n"
-#~ "                                   niz BESEDA pomeni brez uporabe privzetih\n"
+#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
+#~ "(prazen\n"
+#~ "                                   niz BESEDA pomeni brez uporabe "
+#~ "privzetih\n"
 #~ "                                   ključnih besed)\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
 #~ "      --debug                    bolj razčlenjen rezultat razpoznave\n"
@@ -4982,42 +5637,59 @@ msgstr "dokument se je nepričakovano končal: %s"
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer than\n"
-#~ "                                 the output page width, into several lines\n"
+#~ "      --no-wrap                  do not break long message lines, longer "
+#~ "than\n"
+#~ "                                 the output page width, into several "
+#~ "lines\n"
 #~ "  -s, --sort-output              generate sorted output\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "      --copyright-holder=STRING  set copyright holder in output\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
-#~ "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid "
+#~ "bugs\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ msgstr ""
 #~ "Podrobnosti izpisa:\n"
-#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
+#~ "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
+#~ "(privzeto)\n"
 #~ "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 #~ "                             razširjenega nabora znakov\n"
 #~ "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 #~ "  -i, --indent             izpis datoteke PO z zamiki\n"
 #~ "      --no-location        brez vrstic ,#: datoteka:vrstica` v izpisu\n"
-#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu (privzeto)\n"
-#~ "      --strict             izpis v strogi obliki Uniforum, brez razširitev GNU\n"
+#~ "  -n, --add-location       z vrsticami ,#: datoteka:vrstica` v izpisu "
+#~ "(privzeto)\n"
+#~ "      --strict             izpis v strogi obliki Uniforum, brez "
+#~ "razširitev GNU\n"
 #~ "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 #~ "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 #~ "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
 #~ "  -F, --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 #~ "      --omit-header        brez glave z vnosom \"msgid\"\n"
-#~ "      --copyright-holder=NIZ  v izhodu nastavimo nosilca avtorskih pravic na NIZ\n"
-#~ "      --foreign-user       brez copyrighta FSF v izpisu za tuje uporabnike\n"
-#~ "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah msgid\n"
+#~ "      --copyright-holder=NIZ  v izhodu nastavimo nosilca avtorskih pravic "
+#~ "na NIZ\n"
+#~ "      --foreign-user       brez copyrighta FSF v izpisu za tuje "
+#~ "uporabnike\n"
+#~ "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah "
+#~ "msgid\n"
 #~ "  -m, --msgstr-prefix[=NIZ]  NIZ ali \"\" kot predpona za msgstr\n"
 #~ "  -m, --msgstr-suffix[=NIZ]  NIZ ali \"\" kot pripona za msgstr\n"
 
@@ -5046,23 +5718,31 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgstr ""
 #~ "  -d, --domain=DOMENA       prevode iščemo v podani besedilni DOMENI\n"
 #~ "  -e                        omogočimo razširitev ubežnih zaporedij\n"
-#~ "  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
+#~ "  -E                        (združljivost s starejšimi izdajami; "
+#~ "zavrženo)\n"
 #~ "  -h, --help                ta navodila\n"
 #~ "  -n                        brez zaključnega skoka v novo vrstico\n"
 #~ "  -V, --version             različica programa\n"
-#~ "  [DOMENA] MSGID            iščemo prevod gesla MSGID v podani tekstovni DOMENI\n"
+#~ "  [DOMENA] MSGID            iščemo prevod gesla MSGID v podani tekstovni "
+#~ "DOMENI\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
-#~ "Če parameter DOMENA ni podan, se uporabi vrednost spremenljivke TEXTDOMAIN\n"
+#~ "Če parameter DOMENA ni podan, se uporabi vrednost spremenljivke "
+#~ "TEXTDOMAIN\n"
 #~ "iz okolja. Če kataloga sporočil ni moč najti na običajnem mestu, lahko \n"
 #~ "določimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n"
 #~ "Z izbiro -s se program obnaša podobno kot ukaz ,echo`, s to razliko, da\n"
@@ -5074,10 +5754,12 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgstr "Uporaba: %s [IZBIRA] [DOMENA] MSGID MSGID-PLURAL ŠTEVEC\n"
 
 #~ msgid ""
-#~ "Display native language translation of a textual message whose grammatical\n"
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
 #~ "form depends on a number.\n"
 #~ msgstr ""
-#~ "Prikaz prevoda besedilnega sporočila, katerega slovnična oblika je odvisna\n"
+#~ "Prikaz prevoda besedilnega sporočila, katerega slovnična oblika je "
+#~ "odvisna\n"
 #~ "od števila.\n"
 
 #~ msgid ""
@@ -5087,33 +5769,38 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "  -h, --help                display this help and exit\n"
 #~ "  -V, --version             display version information and exit\n"
 #~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
 #~ msgstr ""
 #~ "  -d, --domain=DOMENA       prevode iščemo v podani DOMENI\n"
 #~ "  -e                        omogočimo razširitev ubežnih zaporedij\n"
-#~ "  -E                        (združljivost s starejšimi izdajami; zavrženo)\n"
+#~ "  -E                        (združljivost s starejšimi izdajami; "
+#~ "zavrženo)\n"
 #~ "  -h, --help                ta navodila\n"
 #~ "  -V, --version             različica programa\n"
 #~ "  [DOMENA]                  prevode iščemo v podani DOMENI\n"
-#~ "  MSGID MSGID-PLURAL        prevod MSGID (ednina) ali MSGID_PLURAL (množina)\n"
+#~ "  MSGID MSGID-PLURAL        prevod MSGID (ednina) ali MSGID_PLURAL "
+#~ "(množina)\n"
 #~ "  ŠTEVEC                    določitev edninske/množinske oblike\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
-#~ "Če parameter DOMENA ni podan, se uporabi vrednost spremenljivke TEXTDOMAIN\n"
+#~ "Če parameter DOMENA ni podan, se uporabi vrednost spremenljivke "
+#~ "TEXTDOMAIN\n"
 #~ "iz okolja. Če kataloga sporočil ni moč najti na običajnem mestu, lahko \n"
 #~ "določimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n"
 #~ "Privzet imenik s katalogom sporočil: %s\n"
 
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "datoteka \"%s\" vsebuje sistemski segment, ki ni zaključen z NUL"
-
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "dostop do \"%s\" ofset %ld ni možen"
 
@@ -5136,10 +5823,14 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
@@ -5148,11 +5839,15 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA ...\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
 #~ "  -d, --default-domain=IME       izhod na IME.po (namesto messages.po)\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku IMENIK\n"
-#~ "  -e, --no-escape                brez ubežnih sekvenc v obliki C (privzeto)\n"
-#~ "  -E, --escape                   z ubežnimi sekvencami C, brez razširjenega\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku "
+#~ "IMENIK\n"
+#~ "  -e, --no-escape                brez ubežnih sekvenc v obliki C "
+#~ "(privzeto)\n"
+#~ "  -E, --escape                   z ubežnimi sekvencami C, brez "
+#~ "razširjenega\n"
 #~ "                                 nabora znakov\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z DATOTEKE\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z "
+#~ "DATOTEKE\n"
 #~ "      --force-po                 datoteko PO zapišemo, četudi je prazna\n"
 #~ "  -F, --sort-by-file             izhod uredimo po lokaciji datotek\n"
 #~ "  -h, --help                     ta navodila\n"
@@ -5161,26 +5856,35 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgid ""
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -i, --indent                   oblika datoteke PO z zamiki od levega roba\n"
+#~ "  -i, --indent                   oblika datoteke PO z zamiki od levega "
+#~ "roba\n"
 #~ "      --no-location              brezz vrstic ,#: filename:line`\n"
-#~ "  -n, --add-location             z vrsticami ,#: filename:line` (privzeto)\n"
+#~ "  -n, --add-location             z vrsticami ,#: filename:line` "
+#~ "(privzeto)\n"
 #~ "      --omit-header              brez glave z ,msgid \"\"`\n"
 #~ "  -p, --output=DATOTEKA          izhod zapišemo v podano DATOTEKO\n"
 #~ "  -p, --output-dir=IMENIK        izhodne datoteke zapisane v IMENIK\n"
 #~ "  -s, --sort-output              urejen izpis brez podvojenih vnosov\n"
-#~ "      --strict                   izpis datoteke .po v strogi obliki Uniforum\n"
+#~ "      --strict                   izpis datoteke .po v strogi obliki "
+#~ "Uniforum\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
-#~ "  -u, --unique                   okrajšava za --less-than=2, zahtevamo izpis\n"
+#~ "  -u, --unique                   okrajšava za --less-than=2, zahtevamo "
+#~ "izpis\n"
 #~ "                                 zgolj unikatnih sporočil\n"
 
 #~ msgid ""
@@ -5188,12 +5892,16 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "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"
-#~ "  -c, --check                 perform language dependent checks on strings\n"
-#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\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 "
+#~ "search\n"
 #~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
 #~ "  -h, --help                  display this help and exit\n"
-#~ "      --no-hash               binary file will not include the hash table\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
 #~ "  -o, --output-file=FILE      specify output file name as FILE\n"
 #~ "      --statistics            print statistics about translations\n"
 #~ "      --strict                enable strict Uniforum mode\n"
@@ -5209,7 +5917,8 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "Tekstovni opis prevodov prevedemo v binarni katalog sporočil.\n"
 #~ "\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
-#~ "  -a, --alignment=ŠTEVILO  poravnaj nize znakov na ŠTEVILO bytov (privzeto: %d)\n"
+#~ "  -a, --alignment=ŠTEVILO  poravnaj nize znakov na ŠTEVILO bytov "
+#~ "(privzeto: %d)\n"
 #~ "  -c, --check              na nizih izvedi teste, odvisne od jezika\n"
 #~ "  -D, --directory=IMENIK   vhodne datoteke iščemo tudi v imeniku IMENIK\n"
 #~ "  -f, --use-fuzzy          uporaba ohlapnih prevodov pri izpisu\n"
@@ -5223,8 +5932,10 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "\n"
 #~ "Večkratna izbira -v poveča raven komentarjev ob delovanju.\n"
 #~ "\n"
-#~ "Če je kot ime vhodne datoteke navedeno - (minus), program bere s standardnega\n"
-#~ "vhoda. Če je kot ime izhodne datoteke navedeno - (minus), program piše na\n"
+#~ "Če je kot ime vhodne datoteke navedeno - (minus), program bere s "
+#~ "standardnega\n"
+#~ "vhoda. Če je kot ime izhodne datoteke navedeno - (minus), program piše "
+#~ "na\n"
 #~ "standardni izhod.\n"
 
 #~ msgid "while creating hash table"
@@ -5247,7 +5958,8 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "\n"
 #~ "Pretvorba datoteke iz binarne oblike .mo v obliko Uniforum .po\n"
 #~ "Datoteke .mo so lahko little-endian ali big-endian.\n"
-#~ "Če vhodna datoteka ni podana, ali pa je podano ime -, beremo standardni vhod.\n"
+#~ "Če vhodna datoteka ni podana, ali pa je podano ime -, beremo standardni "
+#~ "vhod.\n"
 #~ "Če ni izbrano drugače, gre izpis na standardni izhod.\n"
 
 #  POZOR!  Nepopolni prevodi
@@ -5260,31 +5972,44 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 #~ "                                 preceding keyword lines) in output file\n"
 #~ "  -C, --c++                      shorthand for --language=C++\n"
-#~ "      --debug                    more detailed formatstring recognision result\n"
-#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n"
-#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n"
-#~ "  -e, --no-escape                do not use C escapes in output (default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended chars\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
 #~ "  -f, --files-from=FILE          get list of input files from FILE\n"
 #~ "      --force-po                 write PO file even if empty\n"
-#~ "      --foreign-user             omit FSF copyright in output for foreign user\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
 #~ "  -F, --sort-by-file             sort output by file location\n"
 #~ msgstr ""
 #~ "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA ...\n"
 #~ "Argumenti, obvezni za dolge oblike izbire, so obvezni tudi za kratke.\n"
 #~ "  -a, --extract-all              iz datotek potegnemo vse nize\n"
 #~ "  -c, --add-comments[=ZNAČKA]    komentarji označeni z ZNAČKO (ali tisti\n"
-#~ "                                 pred vrsticami s ključnimi besedami) naj se\n"
+#~ "                                 pred vrsticami s ključnimi besedami) naj "
+#~ "se\n"
 #~ "                                 izpišejo\n"
 #~ "  -C, --c++                      okrajšava za --language=C++\n"
-#~ "  -d, --default-domain=IME       izhod na IME.po (namesto na messages.po)\n"
-#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku IMENIK\n"
-#~ "  -e, --no-escape                brez ubežnih sekvenc v stilu C (privzeto)\n"
-#~ "  -E, --escape                   z ubežnimi sekvencami C, brez razširjenega\n"
+#~ "  -d, --default-domain=IME       izhod na IME.po (namesto na messages."
+#~ "po)\n"
+#~ "  -D, --directory=IMENIK         vhodne datoteke iščemo tudi v imeniku "
+#~ "IMENIK\n"
+#~ "  -e, --no-escape                brez ubežnih sekvenc v stilu C "
+#~ "(privzeto)\n"
+#~ "  -E, --escape                   z ubežnimi sekvencami C, brez "
+#~ "razširjenega\n"
 #~ "                                 nabora znakov\n"
-#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z DATOTEKE\n"
+#~ "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo z "
+#~ "DATOTEKE\n"
 #~ "      --force-po                 datoteko PO zapišemo, četudi je prazna\n"
-#~ "      --foreign-user             brez sporočila FSF v izhodni datoteki za\n"
+#~ "      --foreign-user             brez sporočila FSF v izhodni datoteki "
+#~ "za\n"
 #~ "                                 tujega uporabnika\n"
 #~ "  -F, --sort-by-file             izhod sortiramo po lokaciji datotek\n"
 
@@ -5292,21 +6017,30 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "  -h, --help                     display this help and exit\n"
 #~ "  -i, --indent                   write the .po file using indented style\n"
 #~ "  -j, --join-existing            join messages with existing file\n"
-#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
+#~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
+#~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
-#~ "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
-#~ "                                 otherwise is guessed from file extension\n"
-#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
-#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
+#~ "  -L, --language=NAME            recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ "                                 otherwise is guessed from file "
+#~ "extension\n"
+#~ "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
 #~ "      --no-location              do not write '#: filename:line' lines\n"
 #~ msgstr ""
 #~ "  -h, --help                     ta navodila\n"
-#~ "  -i, --indent                   izpis datoteke PO z zamiki od levega roba\n"
+#~ "  -i, --indent                   izpis datoteke PO z zamiki od levega "
+#~ "roba\n"
 #~ "  -j, --join-existing            združi sporočila z obstoječo datoteko\n"
-#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah (prazen\n"
-#~ "                                 niz BESEDA pomeni brez uporabe privzetih\n"
+#~ "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
+#~ "(prazen\n"
+#~ "                                 niz BESEDA pomeni brez uporabe "
+#~ "privzetih\n"
 #~ "                                 ključnih besed)\n"
-#~ "  -L, --language=JEZIK           izrecno navedemo programski JEZIK (C, C++, PO);\n"
+#~ "  -L, --language=JEZIK           izrecno navedemo programski JEZIK (C, C+"
+#~ "+, PO);\n"
 #~ "                                 sicer ga poskusimo uganiti iz pripone\n"
 #~ "  -m, --msgstr-prefix[=NIZ]      NIZ ali \"\" kot predpona za msgstr\n"
 #~ "  -M, --msgstr-suffix[=NIZ]      NIZ ali \"\" kot pripona za msgstr\n"
@@ -5314,12 +6048,17 @@ msgstr "dokument se je nepričakovano končal: %s"
 
 #  POZOR!  Nepopolni prevodi
 #~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines (default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' entry\n"
+#~ "  -n, --add-location             generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --omit-header              don't write header with `msgid \"\"' "
+#~ "entry\n"
 #~ "  -o, --output=FILE              write output to specified file\n"
-#~ "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
-#~ "  -s, --sort-output              generate sorted output and remove duplicates\n"
-#~ "      --strict                   write out strict Uniforum conforming .po file\n"
+#~ "  -p, --output-dir=DIR           output files will be placed in directory "
+#~ "DIR\n"
+#~ "  -s, --sort-output              generate sorted output and remove "
+#~ "duplicates\n"
+#~ "      --strict                   write out strict Uniforum conforming .po "
+#~ "file\n"
 #~ "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 #~ "  -V, --version                  output version information and exit\n"
 #~ "  -w, --width=NUMBER             set output page width\n"
@@ -5327,12 +6066,14 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             z vrsticami '#: filename:line' (privzeto)\n"
+#~ "  -n, --add-location             z vrsticami '#: filename:"
+#~ "line' (privzeto)\n"
 #~ "      --omit-header              brez glave z ,msgid \"\"'\n"
 #~ "  -o, --output=DATOTEKA          izhod zapišemo na podano DATOTEKO\n"
 #~ "  -p, --output-dir=IMENIK        izhodne datoteke zapisane v IMENIK\n"
 #~ "  -s, --sort-output              urejen izpis brez podvojenih vnosov\n"
-#~ "      --strict                   strogi stil Uniforum pri izpisu datoteke .po\n"
+#~ "      --strict                   strogi stil Uniforum pri izpisu "
+#~ "datoteke .po\n"
 #~ "  -T, --trigraphs                razumi trigrafe ANSI C na vhodu\n"
 #~ "  -V, --version                  verzija programa\n"
 #~ "  -w, --width=ŠTEVILO            širina vrstice pri izpisu, v znakih\n"
@@ -5344,7 +6085,9 @@ msgstr "dokument se je nepričakovano končal: %s"
 #~ msgstr "%s:%d: opozorilo: gnezdena ključna beseda v argumentu"
 
 #~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr "%s:%d: opozorilo: ključna beseda med zun. ključno besedo in njenim argumentom"
+#~ msgstr ""
+#~ "%s:%d: opozorilo: ključna beseda med zun. ključno besedo in njenim "
+#~ "argumentom"
 
 #, fuzzy
 #~ msgid ""
diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index e5eaef552..331d94a60 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-02 04:44+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,26 +15,29 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "неисправан аргумент „%s“ за „%s“"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "нејасан аргумент „%s“ за „%s“"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Исправни аргументи су:"
 
 #: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
+msgstr ""
+"не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
 
 #: gnulib-lib/clean-temp.c:339
 #, c-format
@@ -55,201 +58,186 @@ msgstr "не могу да уклоним привремени директор�
 msgid "write error"
 msgstr "грешка писања"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "причувавам овлашћења за %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "не могу да отворим датотеку резерве „%s“ за упис"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "грешка читања „%s“"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "грешка писања „%s“"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "грешка након читања „%s“"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "није успела функција „fdopen()“"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "нисам нашао Ц# преводиоца, покушајте да инсталирате пнет"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "нисам нашао Ц# виртуелну машину, покушајте да инсталирате пнет"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Непозната грешка система"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s потпроцес није успео"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ је нејасна; могућности:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: опција „%s“ је нејасна\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: опција „%s“ је нејасна; могућности:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: непозната опција „%c%s“\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: опција „--%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непозната опција „--%s“\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непозната опција „%c%s“\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција -- „%c“\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент -- „%c“\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „-W %s“ захтева аргумент\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "неисправан аргумент издања_извора за преведи_јава_разред"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неисправан аргумент издања_мете за преведи_јава_разред"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "нисам успео да направим „%s“"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "грешка приликом писања датотеке „%s“"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Нисам нашао Јава преводиоца, покушајте да инсталирате гцј или поставите „$JAVAC“"
+msgstr ""
+"Нисам нашао Јава преводиоца, покушајте да инсталирате гцј или поставите "
+"„$JAVAC“"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Нисам нашао виртуелну машину Јаве, покушајте да инсталирате гиј или да поставите „$JAVA“"
+msgstr ""
+"Нисам нашао виртуелну машину Јаве, покушајте да инсталирате гиј или да "
+"поставите „$JAVA“"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "У/И грешка %s потпроцеса"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија је потрошена"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "стварање нити није успело"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "писање у %s потпроцес није успело"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "читање из %s потпроцеса није успело"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "не могу да поставим неблокирајући У/И за потпроцес %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "комуницирање са %s потпроцесом није успело"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s потпроцес је окончан са излазном шифром %d"
@@ -273,13 +261,13 @@ msgstr "%s потпроцес је окончан са излазном шифр
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "“"
 
@@ -289,64 +277,69 @@ msgid "setting permissions for %s"
 msgstr "подешавам овлашћења за %s"
 
 #
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "не могу да направим спојку"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "„_open_osfhandle“ није успело"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не могу да повратим фд %d: „dup2“ није успело"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s потпроцес"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s потпроцес је добио кобни сигнал %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Корени елемент мора бити <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Елемент <%s> не садржи елемент <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Елемент <%s> нема атрибут <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Употреба: %s [ОПЦИЈА...] [ЈЕЗИЧКА ПРАВИЛА]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -361,7 +354,7 @@ msgstr ""
 "ЈЕЗИК из ПРАВИЛА и исписује их у облику погодном геттексу за коришћење.\n"
 "Ако није дат ниједан аргумент, чита ЦЛДР правила множине са стандардног улаза.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -370,27 +363,27 @@ msgstr ""
 "Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
 "Слично и за аргументе избора.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  исписује правила множине у ЦЛДР запису\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  приказује ову помоћ и излази\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               исписује податке о издању и излази\n"
@@ -399,25 +392,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -426,77 +424,78 @@ msgstr ""
 "Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
 "Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написао је %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Даики Уено"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "Не могу да прочитам „%s“"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "не могу да извадим правила за „%s“"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "не могу да обрадим ЦЛДР правило"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "додатни операнд %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "особеност записа за %u. аргумент, као у „%s“, не постоји у „%s“"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "спецификације записа у „%s“ и „%s“ за %u. аргумент нису исте"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Број одреднице %u почиње са | али се не завршава са |."
@@ -506,56 +505,64 @@ msgstr "Број одреднице %u почиње са | али се не за
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "„%s“ није исправна ниска записа %s, није исто као „%s“. Разлог: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "У смерници број %u, члан након „<“ не представља назив макроа спецификације записа. Исправни називи макроа су пописани у ИСО Це 99, одељак 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"У смерници број %u, члан након „<“ не представља назив макроа спецификације "
+"записа. Исправни називи макроа су пописани у ИСО Це 99, одељак 7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "У смерници број %u, члан након „<“ није праћен „>“."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "Ниска упућује на %u. аргумент, али занемарује %u. аргумент."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не подудара се број особености записа у „%s“ и „%s“"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "У смерници број %u, иза { не следи број аргумента."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "У смерници број %u, иза , не следи број аргумента."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Ниска се завршава у сред смернице: нађох { без одговарајуће }."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Смерница број %u се завршава неисправним знаком „%c“ уместо }."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Смерница број %u се завршава неисправним знаком уместо }."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "Ниска почиње у сред смернице: нађох } без одговарајуће {."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Ниска садржи усамљену } након смернице број %u."
@@ -572,12 +579,16 @@ msgstr "У смерници број %u, тачност није дозвоље�
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "У смерници број %u, број аргумента за тачност мора бити једнак %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "У смерници број %u, особеност тачности није дозвољена пре „%c“."
 
 #: src/format-gcc-internal.c:406
@@ -615,93 +626,126 @@ msgid "The string ends in the middle of a directive."
 msgstr "Ниска се завршава у сред смернице."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Ниска упућује на аргументе и помоћу апсолутног броја аргумента и помоћу обичних особености аргумената."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Ниска упућује на аргументе и помоћу апсолутног броја аргумента и помоћу "
+"обичних особености аргумената."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "У смерници број %u, аргумент са бројем 0 није позитиван цео број."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "У смерници број %u, број 0 аргумента ширине није позитиван цео број."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "У смерници број %u, број 0 аргумента тачности није позитиван цео број."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "У смерници број %u, знак „%c“ није исправан одредник претварања."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Знак којим се завршава смерница број %u није исправан одредник претварања."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Знак којим се завршава смерница број %u није исправан одредник претварања."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Ниска упућује на аргумент бр. %u на несагласне начине."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "У смерници број %u, подниска „%s“ не представља исправан стил датума и времена."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"У смерници број %u, подниска „%s“ не представља исправан стил датума и "
+"времена."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "У смерници број %u, након „%s“ не следи запета."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "У смерници број %u, подниска „%s“ не представља исправан стил бројева."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-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“."
+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“."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "У смерници број %u, избор не садржи број."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "У смерници број %u, избор садржи број након кога не следи „<“, „#“ или „%s“."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"У смерници број %u, избор садржи број након кога не следи „<“, „#“ или „%s“."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "особеност записа за аргумент {%u}, као у „%s“, не постоји у „%s“"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "спецификације записа у „%s“ и „%s“ за аргумент {%u} нису исте"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
 msgstr "Ниска упућује на %u. аргумент, али занемарује аргументе %u и %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "одредба записа за аргументе „%u“ и „%u“ не постоји у „%s“, само један аргумент може бити занемарен"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"одредба записа за аргументе „%u“ и „%u“ не постоји у „%s“, само један "
+"аргумент може бити занемарен"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -712,16 +756,30 @@ msgstr "грешка приликом обраде: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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“."
+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“."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "У смерници број %u, дато је превише параметара; очекивах највише %u параметар."
-msgstr[1] "У смерници број %u, дато је превише параметара; очекивах највише %u параметра."
-msgstr[2] "У смерници број %u, дато је превише параметара; очекивах највише %u параметара."
+msgid ""
+"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."
+msgstr[0] ""
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметар."
+msgstr[1] ""
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметра."
+msgstr[2] ""
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметара."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -751,7 +809,9 @@ msgstr "У смерници број %u, дата су оба измењивач
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr "У смерници број %u, након „~:[“ не следе две наредбе, раздвојене „~;“."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
@@ -774,15 +834,19 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "спецификакције записа у „%s“ не представљају подскуп оних из „%s“"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "У смерници број %u, одредник величине је несагласан са одредником претварања „%c“."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"У смерници број %u, одредник величине је несагласан са одредником претварања "
+"„%c“."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -801,8 +865,10 @@ msgstr "У смерници број %u, „%c“ не не може да зап
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "У смерници број %u, није дозвољено више угнежђавања у одреднику записа."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"У смерници број %u, није дозвољено више угнежђавања у одреднику записа."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -810,8 +876,12 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "У смерници број %u, постоји неокончана смерница записа."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Ниска упућује на аргументе и кроз називе аргумената и кроз неименоване наводе аргумената."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Ниска упућује на аргументе и кроз називе аргумената и кроз неименоване "
+"наводе аргумената."
 
 #: src/format-python.c:354
 #, c-format
@@ -820,112 +890,133 @@ msgstr "Ниска упућује на аргумент назива „%s“ н
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "особеност записа у „%s“ очекује мапирање, а они у „%s“ очекују н-торку"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "особеност записа у „%s“ очекује н-торку, а они у „%s“ очекују мапирање"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "особеност записа за аргумент „%s“, као у „%s“, не постоји у „%s“"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "спецификације записа у „%s“ и „%s“ за аргумент „%s“ нису исте"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "„%s“ је ниска обичног записа, али „%s“ није: садржи „L“ обележје или двоцифрени број аргумента"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"„%s“ је ниска обичног записа, али „%s“ није: садржи „L“ обележје или "
+"двоцифрени број аргумента"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Ниска упућује на променљиву љуске помоћу не-АСКРИ назива."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Ниска упућује на променљиву љуске помоћу сложене синтаксе заграда љуске. Ова синтакса овде није подржана из безбедносних разлога."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Ниска упућује на променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
+"синтакса овде није подржана из безбедносних разлога."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Ниска упућује на променљиву љуске чија вредност може бити другачија у функцијама љуске."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Ниска упућује на променљиву љуске чија вредност може бити другачија у "
+"функцијама љуске."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Ниска упућује на променљиву љуске празног назива."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "У смерници број %u, знак „%c“ не представља цифру између 1 и 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Знак којим се завршава смерница број %u није цифра између 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Бруно Хејбл"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Испишите назив рачунара.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Запис излаза:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 кратак назив рачунара\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          дуги назив рачунара, садржи пуни назив домена\n"
 "                              и надимке\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адресе за назив рачунара\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "не могу да добавим назив рачунара"
@@ -936,7 +1027,7 @@ msgid "selector is not specified"
 msgstr "бирач није наведен"
 
 #
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "не могу да направим контекст Икс путање"
@@ -946,29 +1037,29 @@ msgstr "не могу да направим контекст Икс путање
 msgid "cannot evaluate XPath expression: %s"
 msgstr "не могу да проценим израз Икс путање: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "„%s“ чвор не садржи „%s“"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "неисправан аргумент „%s“ за „%s“"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "корени елемент није „правило“ под називним простором %s"
 
 #
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "не могу да прочитам „%s“: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "не могу да проценим путању положаја Икс путање: %s"
@@ -988,28 +1079,28 @@ msgstr "не могу да прочитам ИксМЛ датотеку „%s“
 msgid "the root element is not \"locatingRules\""
 msgstr "корени елемент није „locatingRules“"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "дозвољена је само једна улазна датотека"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s се међусобно искључују"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1018,320 +1109,385 @@ msgstr ""
 "Издвајајте поруке каталога превода према њиховим особинама, и управљајте\n"
 "тим особинама.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Место улазне датотеке:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  УЛАЗНАДАТОТЕКА              улазна по датотека\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=ДИР         додаје ДИР у списак за тражење улазних датотека\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=ДИР         додаје ДИР у списак за тражење улазних "
+"датотека\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Ако није дата улазна датотека или ако је „-“, чита стандардни улаз.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Место излазне датотеке:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  исписује излаз у наведену датотеку\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Резултати се пишу на стандардни излаз ако није наведена излазна датотека или\n"
+"Резултати се пишу на стандардни излаз ако није наведена излазна датотека "
+"или\n"
 "ако је „-“.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор поруке:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated               задржава преведене, уклања непреведене поруке\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated               задржава преведене, уклања непреведене "
+"поруке\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated             задржава непреведене, уклања преведене поруке\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated             задржава непреведене, уклања преведене "
+"поруке\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy                 уклања поруке означене као „нејасне“\n"
+msgstr ""
+"      --no-fuzzy                 уклања поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy               задржава поруке означене као „нејасне“\n"
+msgstr ""
+"      --only-fuzzy               задржава поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete              уклања застареле поруке #~\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete            задржава застареле поруке #~\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Управљање особинама:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy                означава све поруке као „нејасне“\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy              означава све поруке као не-„нејасне“\n"
+msgstr ""
+"      --clear-fuzzy              означава све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete             означава све поруке као застареле\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete           означава све поруке као не-застареле\n"
+msgstr ""
+"      --clear-obsolete           означава све поруке као не-застареле\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous                 када означава „нејасне“, задржава претходни „msgids“\n"
+"      --previous                 када означава „нејасне“, задржава претходни "
+"„msgids“\n"
 "                                 преведених порука.\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous           уклања претходни „msgid“ сасвих порука\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous           уклања претходни „msgid“ сасвих порука\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 када уклања „нејасне“, такође подешава „msgstr“ празним\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 када уклања „нејасне“, такође подешава "
+"„msgstr“ празним\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=ДАТОТЕКА.po    управља једино пољима уписаним у ДАТОТЕЦИ.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=ДАТОТЕКА.po    управља једино пољима уписаним у ДАТОТЕЦИ."
+"po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=ДАТОТЕКА.po  управља једино пољима која нису у ДАТОТЕЦИ.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=ДАТОТЕКА.po  управља једино пољима која нису у ДАТОТЕЦИ."
+"po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                    исто што и --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+"      --fuzzy                    исто што и --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete                 исто што и --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete                 исто што и --only-obsolete --clear-"
+"obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Склоп улазне датотеке:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input         улазна датотека је у склопу „Јава .properties“\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input         улазна датотека је у склопу „Јава ."
+"properties“\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
-"      --stringtable-input        улазна датотека је у склопу „NeXTstep/GNUstep\n"
+"      --stringtable-input        улазна датотека је у склопу „NeXTstep/"
+"GNUstep\n"
 "                                 .strings“\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Појединости излаза:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                    увек користи боје и остале особине текста\n"
-"      --color=КАДА               користи боје и остале особине текста ако је КАДА.\n"
-"                                 КАДА може бити „always“ (увек), „never“ (никада),\n"
+"      --color=КАДА               користи боје и остале особине текста ако је "
+"КАДА.\n"
+"                                 КАДА може бити „always“ (увек), "
+"„never“ (никада),\n"
 "                                 „auto“ (самостално), или „html“.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=ИЗГЛЕДДАТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --color\n"
+msgstr ""
+"      --style=ИЗГЛЕДДАТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --"
+"color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape                не користи Ц знаке промене реда у излазу (задато)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape                не користи Ц знаке промене реда у излазу "
+"(задато)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr "  -E, --escape                   користи Ц знаке промене реда у излазу, без проширених знакова\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                   користи Ц знаке промене реда у излазу, без "
+"проширених знакова\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po                 записује по датотеку чак и ако је празна\n"
+msgstr ""
+"      --force-po                 записује по датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                   записује .по датотеку користећи увучени изглед\n"
+msgstr ""
+"  -i, --indent                   записује .по датотеку користећи увучени "
+"изглед\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location              не исписује редове „#: датотека:ред“\n"
+msgstr ""
+"      --no-location              не исписује редове „#: датотека:ред“\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location             образује редове „#: датотека:ред“ (подразумевано)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location             образује редове „#: датотека:"
+"ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                   исписује .по датотеку изричито складну са Унифорумом\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                   исписује .по датотеку изричито складну са "
+"Унифорумом\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output        исписује датотеку „Јава .properties“\n"
+msgstr ""
+"  -p, --properties-output        исписује датотеку „Јава .properties“\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output       исписује датотеку „NeXTstep/GNUstep .strings“\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output       исписује датотеку „NeXTstep/GNUstep ."
+"strings“\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=БРОЈ               поставља ширину излазне странице\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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"
+"      --no-wrap                  не прекида редове дуге поруке, дуже од "
+"ширине\n"
 "                                 излазне странице, на неколико редова\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output              ствара уређени излаз\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file             ређа излаз према месту датотеке\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1353,23 +1509,24 @@ msgstr ""
 "датотека ће се збрајати, осим ако не користите „--use-first“, тада се\n"
 "узимају из прве ПО датотеке која их одређује.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  УЛАЗНАДАТОТЕКА ...          улазне датотеке\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=ДАТОТЕКА   добавља списак улазних датотека из ДАТОТЕКЕ\n"
+msgstr ""
+"  -f, --files-from=ДАТОТЕКА   добавља списак улазних датотека из ДАТОТЕКЕ\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ако је улазна датотека „-“, чита се стандардни улаз.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1378,7 +1535,7 @@ msgstr ""
 "  -<, --less-than=БРОЈ        исписује поруке са мање од оволико одредница,\n"
 "                              подразумева се бесконачно ако није постављено\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1387,7 +1544,7 @@ msgstr ""
 "  -<, --more-than=БРОЈ        исписује поруке са више од оволико одредница,\n"
 "                              подразумева се 0 ако није постављено\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1396,28 +1553,32 @@ msgstr ""
 "  -u, --unique                скраћеница за „--less-than=2“, захтева\n"
 "                              штампање само јединствених порука\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      улазне датотеке су у синтакси „Јава .properties“\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      улазне датотеке су у синтакси „Јава ."
+"properties“\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     улазне датотеке су у синтакси „NeXTstep/GNUstep \n"
+"      --stringtable-input     улазне датотеке су у синтакси „NeXTstep/"
+"GNUstep \n"
 "                              .strings“\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=НАЗИВ         кодирање за излаз\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1426,32 +1587,34 @@ msgstr ""
 "      --use-first             користи први доступни превод за сваку поруку,\n"
 "                              не спаја више превода\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=НАЗИВКАТАЛОГА    поставља поље „Language“ (језик) у заглављу\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=НАЗИВКАТАЛОГА    поставља поље „Language“ (језик) у заглављу\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Питер Милер"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "нема улазних датотека"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "потребне су тачно 2 улазне датотеке"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [МОГУЋНОСТ] деф.po реф.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1468,72 +1631,75 @@ msgstr ""
 "да ли сте превели сваку поруку вашег програма.  Када неко тачно поклапање\n"
 "не може бити пронађено, користи се нејасно поклапање ради боље дијагностике.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      преводи\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     упуте на изворе\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Измењивачи рада:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          примењује реф.pot на сваки домен у деф.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          примењује реф.pot на сваки домен у деф.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     не користи нејасно поклапање\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             узима у обзир нејасне ставке\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      узима у обзир непреведене ставке\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "ова порука није преведена"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "ову поруку би преводилац требао да прегледа"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ова порука се користи али није одређена..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...али ова одредница је слична"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ова порука се користи али није одређена у „%s“"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1541,12 +1707,12 @@ msgstr[0] "нађох %d кобну грешку"
 msgstr[1] "нађох %d кобне грешке"
 msgstr[2] "нађох %d кобних грешака"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "најмање две датотеке морају бити наведене"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1566,7 +1732,7 @@ msgstr ""
 "примедбе ће бити сачуване, али само из прве ПО датотеке која их\n"
 "одређује.  Положаји датотека из свих ПО датотека ће се збрајати.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1575,65 +1741,69 @@ msgstr ""
 "  ->, --more-than=БРОЈ        исписује поруке са више од оволико одредница,\n"
 "                              подразумева се 1 ако није постављено\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           изоставља заглавље са пољем „msgid \"\"“\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           изоставља заглавље са пољем „msgid \"\"“\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Претворите текст превода из једног кодирања у друго.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Мета претварања:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Задато кодирање је кодирање текућег локалитета.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                увучени изглед излаза\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           избацује редове „#: датотека:ред“\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          чува редове „#: датотека:ред“ (основно)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          чува редове „#: датотека:ред“ (основно)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                изричито Униорумски стил излаза\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "није дата улазна датотека"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "потребна је тачно једна улазна датотека"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЈА]... УЛАЗНАДАТОТЕКА\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1646,22 +1816,22 @@ msgstr ""
 "направљена „xgettext“-ом). Непреведеним пољима се додељује превод\n"
 "идентичан са „msgid“.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  УЛАЗНАДАТОТЕКА              улазна по или пот датотека\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "недостаје назив наредбе"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] НАРЕДБА [ОПЦИЈА-НАРЕДБЕ]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1675,7 +1845,7 @@ msgstr ""
 "једном за сваки превод.  Његов излаз постаје улаз „msgexec“-а. Повратни\n"
 "код „msgexec“-а је највећи повратни код кроз све позиве програма.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1684,47 +1854,47 @@ msgstr ""
 "Нарочита уграђена наредба звана „0“ исписује превод, праћен нула-бајтом.\n"
 "Излаз „msgexec 0“ је погодан као улаз за „xargs -0“.\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Улаз наредбе:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   додаје нови ред на крају улаза\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА улазна ПО датотека\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "није успело писање на стандардни излаз"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "недостаје назив пропусника"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "најмање један седов спис мора бити наведен"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] ПРОПУСНИК [ОПЦИЈА-ПРОПУСНИКА]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Примените пропусник на све преводе из каталога превода.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1733,12 +1903,12 @@ msgstr ""
 "ПРОПУСНИК може бити било који програм који чита превод са стандардног\n"
 "улаза и пише измењени превод на стандардни излаз.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Издваја улаз и излаз:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1747,120 +1917,130 @@ msgstr ""
 "  --newline                   додаје нови ред на крај улаза и уклања\n"
 "                              нови ред са краја излаза"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисне ОПЦИЈЕ-ПРОПУСНИКА када је сед ПРОПУСНИК:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=СПИС       додаје СПИС наредбама да би биле извршене\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=СПИС       додаје СПИС наредбама да би биле извршене\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=ДАТОТЕКАСПИСА    додаје садржај ДАТОТЕКЕСПИСА наредбама\n"
 "                              да би биле извршене\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       обуставља аутоматски испис простора образаца\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       обуставља аутоматски испис простора образаца\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             не користи Ц знаке промене реда у излазу (задато)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             не користи Ц знаке промене реда у излазу "
+"(задато)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                увучени изглед излаза\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           не мењај поље са заглављем, не филтрирај га\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           не мењај поље са заглављем, не филтрирај га\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "излаз пропусника није окончан новим редом"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент за „%s“ треба да буде знак једне тачке"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неисправан поредак од мањег: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "не треба бити дата ниједна улазна датотека ако су наведени „%s“ и „%s“"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "„%s“ захтева одредницу „-d директоријум“"
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "„%s“ захтева одредницу „-l језик“"
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "„%s“ захтева одредницу „--template шаблон“"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "„%s“ захтева одредницу „-o датотека“"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "„%s“ и „%s“ се међусобно искључују у „%s“"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s је исправно само са %s, %s или %s"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "не могу да пронађем „ITS“ правила за „%s“"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1868,7 +2048,7 @@ msgstr[0] "%d преведена порука"
 msgstr[1] "%d преведене поруке"
 msgstr[2] "%d преведених порука"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1876,7 +2056,7 @@ msgstr[0] ", %d нејсан превод"
 msgstr[1] ", %d нејасна превода"
 msgstr[2] ", %d нејсаних превода"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1884,126 +2064,159 @@ msgstr[0] ", %d непреведена порука"
 msgstr[1] ", %d непреведене поруке"
 msgstr[2] ", %d непреведених порука"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створите бинарни каталог порука из текстуалног описа превода.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Начин рада:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  режим Јаве: ствара Јавин разред „Група "
+"изворишта“\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  режим Јаве: ствара Јавин разред „Група изворишта“\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 као --java, и претпоставља Јаву2 (ЈДК 1.2 или "
+"новији)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 као --java, и претпоставља Јаву2 (ЈДК 1.2 или новији)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr ""
+"      --csharp                Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      Режим Ц# изворишта: ствара .НЕТ-ову „."
+"resources“ датотеку\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      Режим Ц# изворишта: ствара .НЕТ-ову „.resources“ датотеку\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Тцл режим: ствара тцл/мсгкат-ову „.msg“ "
+"датотеку\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Тцл режим: ствара тцл/мсгкат-ову „.msg“ датотеку\n"
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr ""
+"      --qt                    Кут режим: ствара Кутову „.qm“ датотеку\n"
 
 #: src/msgfmt.c:943
 #, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    Кут режим: ствара Кутову „.qm“ датотеку\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               Режим Десктоп уноса: ствара „.desktop“ "
+"датотеку\n"
 
 #: src/msgfmt.c:945
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               Режим Десктоп уноса: ствара „.desktop“ датотеку\n"
-
-#: src/msgfmt.c:947
-#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   ИксМЛ режим: ствара ИксМЛ датотеку\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                укључује изричити режим Унифорума\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ако је излазна датотека -, излаз се записује на стандардни излаз.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Путања излазне датотеке у Јава режиму:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ИЗВОРИШТЕ    назив изворишта\n"
 
-#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=ЛОКАЛИТЕТ      назив локалитета, било језик или језик_ДРЖАВА\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                ствара датотеку „.java“ уместо „.class“\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                ствара датотеку „.java“ уместо „.class“\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за хијерархију \n"
 "                              директоријума разреда\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Назив разреда се одређује придодавањем назива локалитета на назив изворишта,\n"
+"Назив разреда се одређује придодавањем назива локалитета на назив "
+"изворишта,\n"
 "раздвојено подвлаком.  Опција -d је обавезна.  Разред се уписује под\n"
 "наведеним директоријумом.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Путања излазне датотеке у Ц# режиму:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll датотеке од локалитета зависне\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll датотеке од "
+"локалитета зависне\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2012,39 +2225,44 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се уписује у поддиректоријум\n"
 "датог директоријума чији назив зависи од локалитета.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Путања излазне датотеке у Тцл режиму:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d ДИРЕКТОРИЈУМ             основни директоријум каталога .msg порука\n"
+msgstr ""
+"  -d ДИРЕКТОРИЈУМ             основни директоријум каталога .msg порука\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
+msgstr ""
+"Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Могућности режима Десктоп уноса:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=ШАБЛОН                 „.desktop“ датотека која се користи као шаблон\n"
+msgstr ""
+"  --template=ШАБЛОН                 „.desktop“ датотека која се користи као "
+"шаблон\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d ДИРЕКТОРИЈУМ                   основни директоријум „.po“ датотека\n"
+msgstr ""
+"  -d ДИРЕКТОРИЈУМ                   основни директоријум „.po“ датотека\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2053,188 +2271,210 @@ msgstr ""
 "  -kРЕЧ, --keyword=РЕЧ              тражи РЕЧ као додатну кључну реч\n"
 "  -k, --keyword                     не користи задате кључне речи\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Опције „-l“, „-o“ и „--template“ су обавезне.  Ако је наведено „-D“, улазне\n"
 "датотеке се читају из директоријума уместо из аргумената линије наредби.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Могућности режима ИксМЛ-а:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=НАЗИВ              препознаје наведени ИксМЛ језик\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
-msgstr "  --template=ШАБЛОН                 ИксМЛ датотека која се користи као шаблон\n"
+msgstr ""
+"  --template=ШАБЛОН                 ИксМЛ датотека која се користи као "
+"шаблон\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тумачење улазне датотеке:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                      извршава све провере које подразумевају\n"
-"                                   --check-format, --check-header, --check-domain\n"
+"                                   --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format               проверава ниске записа у зависности од језика\n"
+msgstr ""
+"      --check-format               проверава ниске записа у зависности од "
+"језика\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header               проверава присуство и садржај заглавља\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header               проверава присуство и садржај заглавља\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain               проверава сукобе међу смерницама домена и\n"
+"      --check-domain               проверава сукобе међу смерницама домена "
+"и\n"
 "                                   опције „--output-file“\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility        проверава да ли се Гнуов мсгфмт понаша као \n"
+"  -C, --check-compatibility        проверава да ли се Гнуов мсгфмт понаша "
+"као \n"
 "                                   Икс/Опен мсгфмт\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
-msgstr "      --check-accelerators[=ЗНАК]  проверава присуство пречица тастатуре у                                  ставкама изборника\n"
+msgstr ""
+"      --check-accelerators[=ЗНАК]  проверава присуство пречица тастатуре "
+"у                                  ставкама изборника\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy                  користи нејасне уносе на излазу\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=БРОЈ             поравнава ниске на БРОЈ бајтова (обично: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=БРОЈ             поравнава ниске на БРОЈ бајтова (обично: "
+"%d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=ПОРЕДАКБАЈТОВА  пише 32-битне бројеве по датом редоследу бајтова\n"
-"                                   (велики или мали, у зависности од платформе)\n"
+"      --endianness=ПОРЕДАКБАЈТОВА  пише 32-битне бројеве по датом редоследу "
+"бајтова\n"
+"                                   (велики или мали, у зависности од "
+"платформе)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash                    бинарна датотека неће садржати хеш табелу\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash                    бинарна датотека неће садржати хеш "
+"табелу\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics                 исписује статистику о преводима\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose                    повећава ниво опширности\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "упозорење: заглавље по датотеке недостаје или је неисправно\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "упозорење: претварање скупа знакова неће радити\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "упозорење: заглавље по датотеке је нејасно\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "упозорење: старија издања мсгфмт-а ће овде наићи на грешку\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "назив домена „%s“ није прикладан за назив датотеке"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "назив домена „%s“ није прикладан за назив датотеке: користићу префикс"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "смерница „domain %s“ је занемарена"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "празан „msgstr“ унос је занемарен"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "нејасан „msgstr“ унос је занемарен"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: упозорење: изворна датотека садржи нејасан превод"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "Не постоји „%s“"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "„%s“ постоји али је не могу прочитати"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "опција „%c“ се не може користити пре него што се наведе „J“ или „K“ или „T“ или „C“ или „X“"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"опција „%c“ се не може користити пре него што се наведе „J“ или „K“ или „T“ "
+"или „C“ или „X“"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2243,7 +2483,7 @@ msgstr ""
 "Извлачи све поруке из каталога превода које одговарају датом шаблону\n"
 "или припадају одређеним изворним датотекама.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2318,32 +2558,41 @@ msgstr ""
 "  -v, --invert-match               исписује само поруке које не одговарају\n"
 "                                   ни једном услову избора\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                користи Ц знаке промене реда у излазу, без проширених знакова\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                користи Ц знаке промене реда у излазу, без "
+"проширених знакова\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ствара уређени излаз\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ређа излаз према месту датотеке\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Ви користите окружење независно од језика. Поставите променљиву \n"
 "окружења „LANG“, како је описано у датотеци „ABOUT-NLS“. Ово је\n"
 "неопходно ради испробавања ваших превода.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2354,12 +2603,12 @@ msgstr ""
 "Наведите локалитет помоћу опције --locale или \n"
 "излазну ПО датотеку помоћу опције --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Направио је %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2368,26 +2617,27 @@ msgstr ""
 "Стварам нову ПО датотеку, постављајући мета податке помоћу вредности из\n"
 "корисничког окружења.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=УЛАЗНАДАТОТЕКА  улазна ПОТ датотека\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Уколико улазна датотека није дата, текући директоријум се претражује за\n"
 "ПОТ датотеком. Уколико је „-“, чита се стандардни улаз.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  исписује излаз у наведену ПО датотеку\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2397,17 +2647,20 @@ msgstr ""
 "подешавања корисничког локалитета. Ако је „-“, резултат се исписује на\n"
 "стандардни излаз.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=ЈЈ_ДД          поставља одредишни локалитет\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         претпоставља да је ПО датотека самоизграђена\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         претпоставља да је ПО датотека самоизграђена\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2415,12 +2668,12 @@ msgstr ""
 "Нађох више од једне .пот датотеке.\n"
 "Наведите улазну .пот датотеку помоћу опције „--input“.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка читања текућег директоријума"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2428,84 +2681,96 @@ msgstr ""
 "Не нађох .пот датотеку у текућем директоријуму.\n"
 "Наведите улазну .пот датотеку помоћу опције „--input“.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s: потпроцес није успео са излазном шифром %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Нови каталог порука треба да садржи адресу ваше ел. поште, како би корисници\n"
-"могли да вам дају примедбе на превод, и како би одржаваоци могли да вам се обрате\n"
+"Нови каталог порука треба да садржи адресу ваше ел. поште, како би "
+"корисници\n"
+"могли да вам дају примедбе на превод, и како би одржаваоци могли да вам се "
+"обрате\n"
 "у случају непредвиђених техничких проблема.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Преводи на српски језик за пакет „%s“"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "два различита скупа знакова „%s“ и „%s“ у улазној датотеци"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека „%s“ не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-cat.c:208
+#: 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 "домен „%s“ у улазној датотеци „%s“ не садржи поље заглавља са ознаком скупа знакова"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"домен „%s“ у улазној датотеци „%s“ не садржи поље заглавља са ознаком скупа "
+"знакова"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "одредишни скуп знакова „%s“ није назив преносивог кодирања."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у УТФ-8.\n"
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у "
+"УТФ-8.\n"
 "Претварам излаз у УТФ-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2518,7 +2783,7 @@ msgstr ""
 "Или промените све мсгид и мсгцтхт поруке у чисти АСКРИ, или осигурајте\n"
 "да су од самог почетка кодиране у УТФ-8, тј. већ вашим изворним датотекама.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2531,12 +2796,12 @@ msgstr ""
 "Излаз за „%s“ може бити нетачан.\n"
 "Могућа решења су:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2547,7 +2812,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  а онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2560,7 +2825,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  и онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2589,8 +2854,11 @@ msgid "plural expression can produce integer overflow"
 msgstr "израз за множине може проузроковати прекорачење целих бројева"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2639,10 +2907,14 @@ msgstr[1] "али неке поруке имају %lu облика за мно�
 msgstr[2] "али неке поруке имају %lu облика за множину"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "каталог порука садржи преводе облика множине, али нема поља заглавља „Plural-Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"каталог порука садржи преводе облика множине, али нема поља заглавља „Plural-"
+"Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgid_plural“ не почињу оба са „\\n“"
 
@@ -2651,11 +2923,11 @@ msgstr "„msgid“ и „msgid_plural“ не почињу оба са „\\n�
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgstr[%u]“ не почињу оба са „\\n“"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgstr“ не почињу оба са „\\n“"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgid_plural“ не завршавају се оба са „\\n“"
 
@@ -2664,11 +2936,11 @@ msgstr "„msgid“ и „msgid_plural“ не завршавају се оба
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgstr[%u]“ не завршавају се оба са „\\n“"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgstr“ не завршавају се оба са „\\n“"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "баратање множинама је проширење Гнуовог геттекста"
 
@@ -2700,15 +2972,15 @@ msgstr "АСКРИ тротачка (...) уместо Јуникода"
 msgid "space before ellipsis found in user visible strings"
 msgstr "пронађен је размак пре тротачке у нискама које види корисник"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "коришћен је АСКРИ двоструки наводник уместо Јуникода"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "коришћен је АСКРИ једноструки наводник уместо Јуникода"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "АСКРИ метак (%c) уместо Јуникода"
@@ -2723,37 +2995,49 @@ msgstr "%s: улаз није исправан у „%s“ кодирању"
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(), а иконв() не подржава ово претварање."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(), а иконв() не "
+"подржава ово претварање."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Претварање из „%s“ у „%s“ уводи понављања: неке различите мсгид поруке постају једнаке."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Претварање из „%s“ у „%s“ уводи понављања: неке различите мсгид поруке "
+"постају једнаке."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је изграђено без иконв()-а."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+msgstr ""
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је "
+"изграђено без иконв()-а."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s је исправно само са %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "врста резерве"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2776,17 +3060,17 @@ msgstr ""
 "примедбе и положаји у датотекама. Када нема тачног поклапања, користи се\n"
 "нејасно поклапање ради добијања бољих резултата.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      преводи који упућују на старе изворе\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     упуте на нове изворе\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2795,7 +3079,7 @@ msgstr ""
 "  -C, --compendium=ДАТОТЕКА   додатна библиотека превода порука, може се\n"
 "                              навести више пута\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2804,143 +3088,173 @@ msgstr ""
 "  -U, --update                освежава деф.по,\n"
 "                              не ради ништа ако је деф.по већ освежена\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Путања излазне датотеке у режиму освежавања:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Резултат се уписује назад у деф.по.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=УПРАВЉАЊЕ      прави резерву за деф.по\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=СУФИКС         мења уобичајени суфикс за резерве\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"Начин управљања издањима се може изабрати помоћу опције „--backup“ или кроз \n"
+"Начин управљања издањима се може изабрати помоћу опције „--backup“ или "
+"кроз \n"
 "променљиву окружења „VERSION_CONTROL“. Овде су дозвољене вредности:\n"
 "  none, off       не прави резерве (чак и ако је наведено „--backup“)\n"
 "  numbered, t     прави побројане резерве\n"
 "  existing, nil   побројане ако већ постоје побројане резерве, иначе обичне\n"
 "  simple, never   увек прави обичне резерве\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или променљивом\n"
+"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или "
+"променљивом\n"
 "окружења „SIMPLE_BACKUP_SUFFIX“.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                       препознаје ниске записа Буст-а\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              задржава претходне мсгид-се преведених порука\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              задржава претходне мсгид-се преведених порука\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       потискује указиваче напредовања\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ова порука треба да одреди облике множине"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ова порука не треба да одреди облике множине"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sПрочитах %ld старих + %ld упутних, спојених %ld, нејасних %ld, недостајућих %ld, превазиђених %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sПрочитах %ld старих + %ld упутних, спојених %ld, нејасних %ld, "
+"недостајућих %ld, превазиђених %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " готово.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [ДАТОТЕКА]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Претворите бинарни каталог порука у .по датотеку Унифорум стила.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Јава режим: улаз је Јавин разред „Група изворишта“\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Јава режим: улаз је Јавин разред „Група "
+"изворишта“\n"
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                Ц# режим: улаз је .НЕТ-ова „.dll“ датотека\n"
+msgstr ""
+"      --csharp                Ц# режим: улаз је .НЕТ-ова „.dll“ датотека\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      Режим Ц# изворишта: улаз је .НЕТ-ова „.resources“ датотека\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      Режим Ц# изворишта: улаз је .НЕТ-ова „."
+"resources“ датотека\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Тцл режим: улаз је тцл/мсгкат-ова „.msg“ датотека\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Тцл режим: улаз је тцл/мсгкат-ова „.msg“ "
+"датотека\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ДАТОТЕКА ...                улазне .мо датотеке\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Путања улазне датотеке у Јава режиму:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Назив разреда се одређује надодавањем назива локалитета на назив изворишта,\n"
 "раздвојених подвлаком. Разред се проналази помоћу „CLASSPATH“.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Путања улазне датотеке у Ц# режиму:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2949,29 +3263,31 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се налази у поддиректоријуму \n"
 "датог директоријума чији назив зависи од локалитета.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Путања улазне датотеке у Тцл режиму:\n"
 
-#: src/msgunfmt.c:486
+#: 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"
+msgstr ""
+"Опције -l и -d су обавезне.  Датотека „.msg“ се налази у датом "
+"директоријуму.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                записује увучени изглед излаза\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                пише изричитим стилом унифорума\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2993,17 +3309,21 @@ msgstr ""
 "такође збрајати. Када се користи опција „--unique“, поновљени преводи\n"
 "се занемарују.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              исписује само дупликате\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                исписује само јединствене поруке, одбацујући дупликате\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                исписује само јединствене поруке, одбацујући "
+"дупликате\n"
 
-#: src/open-catalog.c:57 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 "<стдулаз>"
@@ -3064,27 +3384,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "недоследно стање за #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "недостаје одељак „msgstr[]“"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "недостаје одељак „msgid_plural“"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "недостаје одељак „msgstr“"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "први облик множине користи не-нула индекс"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "облик множине има погрешан индекс"
@@ -3094,7 +3414,7 @@ msgstr "облик множине има погрешан индекс"
 msgid "too many errors, aborting"
 msgstr "превише грешака, прекидам"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неисправан низ мултибајтова"
@@ -3104,41 +3424,41 @@ msgstr "неисправан низ мултибајтова"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "непотпун низ мултибајтова на крају датотеке"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "непотпун низ мултибајтова на крају реда"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "неуспех иконв-а"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "кључна реч „%s“ је непозната"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "неисправан низ управљања"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "знак за крај датотеке унутар ниске"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "знак за крај реда унутар ниске"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "садржајни раздвајач <ЕОТ> унутар ниске"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ова датотека не може да садржи смернице домена"
@@ -3168,7 +3488,7 @@ msgstr "недостаје = након „%s“"
 msgid "invalid non-blank line"
 msgstr "неисправан не-празан ред"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "датотека „%s“ је скраћена"
@@ -3178,29 +3498,46 @@ msgstr "датотека „%s“ је скраћена"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "датотека „%s“ није у Гнуовом .mo запису"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом, на %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "упозорење: неисправна синтакса „\\uxxxx“ за Уникод знак"
 
-#: src/read-stringtable.c:803
+# bug: there are similar messages with "%s:%lu: warning:"
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: упозорење: усамљена замена „U+%04X“"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "упозорење: неисправан знак Уникода"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "упозорење: неокончана ниска"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "упозорење: грешка синтаксе"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "упозорење: неокончан пар кључ/вредност"
 
@@ -3208,11 +3545,11 @@ msgstr "упозорење: неокончан пар кључ/вредност"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "упозорење: грешка синтаксе, очекивах ; након ниске"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "упозорење: грешка синтаксе, очекивах = или ; након ниске"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Написали су %s и %s.\n"
@@ -3221,16 +3558,16 @@ msgstr "Написали су %s и %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Данило Шеган"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Пребаците српски текст са ћириличног на латинично писмо.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3239,27 +3576,27 @@ msgstr ""
 "Улазни текст се чита са стандардног улаза.  Претворени текст је излаз\n"
 "стандардног излаза.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "улаз није исправан у „%s“ кодирању"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "очекивах два аргумента"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Употреба: %s [ОПЦИЈА] АДРЕСА ДАТОТЕКА\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3268,111 +3605,137 @@ msgstr ""
 "Преузима и исписује садржај адресе. Уколико не може да приступи адреси,\n"
 "користи се месно доступна ДАТОТЕКА уместо ње.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "грешка читања „%s“"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "грешка записивања стандардног излаза"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "грешка након читања „%s“"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Довлачим „%s“..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " истекло је време.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " нисам успео.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Не могу да испишем више домена превода у једну датотеку са наведеним записом излаза. Покушајте да користите синтаксу ПО датотеке уместо тога."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
+"излаза. Покушајте да користите синтаксу ПО датотеке уместо тога."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Не могу да испишем више домена превода у једну датотеку са наведеним записом излаза."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
+"излаза."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "каталог порука садржи преводе зависне од садржаја, али запис излаза их не подржава."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"каталог порука садржи преводе зависне од садржаја, али запис излаза их не "
+"подржава."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "каталог порука садржи преводе са облицима множине, али запис излаза их не подржава. Покушајте да створите разред Јаве користећи „msgfmt --java“ уместо датотеке особина."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"каталог порука садржи преводе са облицима множине, али запис излаза их не "
+"подржава. Покушајте да створите разред Јаве користећи „msgfmt --java“ уместо "
+"датотеке особина."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "каталог порука садржи преводе са облицима множине, али запис излаза их не подржава."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"каталог порука садржи преводе са облицима множине, али запис излаза их не "
+"подржава."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не могу да створим излазну датотеку „%s“"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "стандардни излаз"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "нисам успео да направим директоријум „%s“"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "изграђивање Ц# разреда није успело, пробајте „--verbose“"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "изграђивање Ц# разреда није успело"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка приликом отварања „%s“ за писање"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "неисправан назив разреда Јаве: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "изграђивање разреда Јаве није успело, пробајте „--verbose“ или поставите „$JAVAC“"
+msgstr ""
+"изграђивање разреда Јаве није успело, пробајте „--verbose“ или поставите "
+"„$JAVAC“"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "изграђивање разреда Јаве није успело, пробајте да поставите „$JAVAC“"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "непотпун низ мултибајтова"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове за крај реда"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"интернационализоване поруке не треба да садрже „\\%c“ низове за крај реда"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3385,7 +3748,7 @@ msgstr ""
 "другачије од вашег. Пробајте да користите чисти АСКРИ мсгцтхт.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3408,7 +3771,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3426,12 +3790,12 @@ msgstr ""
 "скупа али запис каталога порука Кут-а подржава Уникод једино у\n"
 "преведним нискама, не у непреведним нискама\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "грешка приликом уписа у подпроцес „%s“"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3439,7 +3803,7 @@ msgstr ""
 "каталог порука садржи преводе зависне од садржаја,\n"
 "али запис Ц# „.resources“ не подржава садржаје\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3447,7 +3811,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али запис Ц# „.resources“ не подржава руковање множинама\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3455,7 +3819,7 @@ msgstr ""
 "каталог порука садржи преводе зависне од садржаја,\n"
 "али запис каталога порука Тцл-а не подржава садржаје\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3463,36 +3827,56 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али запис каталога порука Тцл-а не подржава руковање множинама\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: упозорење: неокончани регуларни израз"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "упозорење: неисправан знак Уникода"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: упозорење: неисправан знак Уникода"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: упозорење: литерал ниске није окончан"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: упозорење: литерал ниске није окончан"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: упозорење: литерал ниске није окончан"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: упозорење: константа знака није окончана"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: упозорење: литерал ниске није окончан"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Наведите кодирање извора помоћу „--from-code“."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3501,7 +3885,7 @@ msgstr ""
 "%s:%d: Неисправан низ мултибајтова.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3510,7 +3894,7 @@ msgstr ""
 "%s:%d: Дуги недовршени низ мултибајтова.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3519,7 +3903,7 @@ msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3528,12 +3912,12 @@ msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају реда.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: неуспех иконв-а"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3542,119 +3926,144 @@ msgstr ""
 "%s:%d: Неисправан низ мултибајтова.\n"
 "Наведите кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: упозорење: неисправан знак Уникода"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: упозорење: константа ниске није окончана"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: упозорење: нађох ) где очекивах }"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: упозорење: нађох } где очекивах )"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "„%s“ није исправан назив кодирања.  Користићу АСКРИ.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "провера синтаксе „%s“ је непозната"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "врста краја реченице „%s“ је непозната"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "„--join-existing“ се не може користити када се излаз исписује на стандардни излаз"
+msgstr ""
+"„--join-existing“ се не може користити када се излаз исписује на стандардни "
+"излаз"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "„xgettext“ не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "упозорење: не постоји датотека „%s“ „ITS“ правила"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "упозорење: не постоји датотека „%s“ „ITS“ правила; проверите инсталацију геттекста"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"упозорење: не постоји датотека „%s“ „ITS“ правила; проверите инсталацију "
+"геттекста"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "упозорење: проширење „%2$s“ датотеке „%1$s“ није познато; пробаћу Ц"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извуците преводиве ниске из датих улазних датотека.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, 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"
+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:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ДАТОТЕКА             исписује излаз у наведену датотеку\n"
+msgstr ""
+"  -o, --output=ДАТОТЕКА             исписује излаз у наведену датотеку\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=ДИР              излазне датотеке се смештају у директоријум ДИР\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=ДИР              излазне датотеке се смештају у "
+"директоријум ДИР\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=НАЗИВ              препознаје наведени језик\n"
 "                                    (Ц, Ц++, ОбјектниЦ, ПО, Љуска, Питон,\n"
 "                                    Лисп, ЕмаксЛисп, либреп, Шема, Смолток,\n"
 "                                    Јава, ЈаваОсобине, Ц#, авк, УЦП, Тцл,\n"
 "                                    Перл, ПХП, ГЦЦ-извор, НИксНискеТабела,\n"
-"                                    РСТ, Глејд, Луа, ЈаваСпис, Вала, Десктоп)\n"
+"                                    РСТ, Глејд, Луа, ЈаваСпис, Вала, "
+"Десктоп)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                         скраћеница за „--language=Ц++“\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Подразумева се погађање језика на основу проширења назива улазне датотеке.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Подразумева се погађање језика на основу проширења назива улазне датотеке.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3663,35 +4072,41 @@ msgstr ""
 "      --from-code=НАЗИВ             кодирање улазних датотека\n"
 "                                    (осим за Питона, Тцл-а, Глејд-а)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing               спаја поруке са постојећом датотеком\n"
+msgstr ""
+"  -j, --join-existing               спаја поруке са постојећом датотеком\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=ДАТОТЕКА.po    поља из ДАТОТЕКЕ.po се не извлаче\n"
+msgstr ""
+"  -x, --exclude-file=ДАТОТЕКА.po    поља из ДАТОТЕКЕ.po се не извлаче\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cОЗНАКА, --add-comments=ОЗНАКА   поставља блокове напомене почевши са ОЗНАКОМ и\n"
-"                                    претходи редове кључних речи у излазној датотеци\n"
-"  -c, --add-comments                поставља све блокове напомена пре редова\n"
+"  -cОЗНАКА, --add-comments=ОЗНАКА   поставља блокове напомене почевши са "
+"ОЗНАКОМ и\n"
+"                                    претходи редове кључних речи у излазној "
+"датотеци\n"
+"  -c, --add-comments                поставља све блокове напомена пре "
+"редова\n"
 "                                    кључних речи у излазној датотеци\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3702,7 +4117,7 @@ msgstr ""
 "                                (тротачка-јуникод, размак-тротачка,\n"
 "                                 наводник-јуникод, метак-јуникод)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3713,56 +4128,62 @@ msgstr ""
 "                                (један-размак, који је основни, \n"
 "                                 или двоструки-размак)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Посебне наредбе језика:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all                 извлачи све ниске\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                    (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
 "                                    Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
-"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-извор,\n"
+"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
+"извор,\n"
 "                                    Луа, ЈаваСпис, Вала)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                    (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
 "                                    Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
-"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-извор,\n"
+"                                    Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
+"извор,\n"
 "                                    Луа, ЈаваСпис, Вала, Десктоп)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=РЕЧ:АРГ:ОБЕЛЕЖЈЕ       додатно обележје за ниске унутар броја\n"
 "                                    аргумента АРГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
@@ -3771,185 +4192,134 @@ msgstr ""
 "                                    Јава, Ц#, авк, ЈЦП, Тцл, Перл, ПХП,\n"
 "                                    ГЦЦ-извор, Луа, ЈаваСпис, Вала)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs                   разуме АНСИ Ц триграфе за улаз\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                    (само језици Ц, Ц++, ОбјектниЦ)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=ДАТОТЕКА           примењује „ITS“ правила из ДАТОТЕКЕ\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
-msgstr "                                    (само језици засновани на ИксМЛ-у)\n"
+msgstr ""
+"                                    (само језици засновани на ИксМЛ-у)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                          препознаје ниске записа Кут-а\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                    (само језик Ц++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                         препознаје ниске записа КДЕ-а 4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                       препознаје ниске записа Буст-а\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                       опширнији резултат препознавања записа ниске\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                       опширнији резултат препознавања записа "
+"ниске\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output           исписује датотеку Јава „.properties“\n"
+msgstr ""
+"      --properties-output           исписује датотеку Јава „.properties“\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               записује напомене итс-алата\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=НИСКА      поставља носиоца ауторских права у излазу\n"
+msgstr ""
+"      --copyright-holder=НИСКА      поставља носиоца ауторских права у "
+"излазу\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user                избацује ауторска права ФСФ у излазу за стране кориснике\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user                избацује ауторска права ФСФ у излазу за "
+"стране кориснике\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=ПАКЕТ          поставља назив пакета на излазу\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=ИЗДАЊЕ      поставља издање пакета на излазу\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=АДРЕСА@ЕЛ.ПОШТЕ  поставља адресу за пријављивање \n"
+"      --msgid-bugs-address=АДРЕСА@ЕЛ.ПОШТЕ  поставља адресу за "
+"пријављивање \n"
 "                                           грешака у мсгид-овима\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
-msgstr "  -m[НИСКА], --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс поља мсгстр-а\n"
+msgstr ""
+"  -m[НИСКА], --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс поља "
+"мсгстр-а\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
-msgstr "  -M[НИСКА], --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс поља мсгстр-а\n"
-
-#: src/xgettext.c:2040
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:[пролаз-]<обележје>: %s"
-
-#: src/xgettext.c:2165
-msgid "standard input"
-msgstr "стандардни улаз"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Не-АСКРИ знак на %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Не-АСКРИ напомена на или пре %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Не-АСКРИ ниска на %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: упозорење: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Иако се користи на месту ниске записа, %s не представља исправну ниску записа %s. Разлог: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Иако је објављена као таква, %s не представља исправну ниску записа %s. Разлог: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"„%s“ запис ниске са неименованим аргументима не може бити исправно локализован:\n"
-"Преводилац не може да промени поредак аргумената.\n"
-"Размотрите употребу ниску заоиса са именованим аргументима,\n"
-"и са мапирањем уместо н-торке за аргументе.\n"
+"  -M[НИСКА], --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс поља "
+"мсгстр-а\n"
 
-#: src/xgettext.c:2545
+#: src/xgettext.c:1597
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Празан мсгид.  Ово је задржано за потребе Гнуовог геттекста-а:\n"
-"„gettext(\"\")“ исписује поље заглавља са мета-подацима, а не\n"
-"празну ниску.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "нејасана особеност аргумента за кључну реч „%.*s“"
+"Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:"
+"[пролаз-]<обележје>: %s"
 
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "упозорење: недостаје контекст за кључниу реч „%.*s“"
-
-#: src/xgettext.c:3334
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "упозорење: недостаје контекст за аргумент множине кључне речи „%.*s“"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "контекст се разликује између облика за једнину и множину"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "стандардни улаз"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3961,22 +4331,16 @@ msgstr ""
 "променљиву „MSGID_BUGS_ADDRESS“; у супротном наведите\n"
 "опцију „--msgid-bugs-address“ у наредби.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "језик „%s“ је непознат"
 
-# bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: упозорење: усамљена замена „U+%04X“"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Наведите кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3985,7 +4349,7 @@ msgstr ""
 "%s:%d: Неисправан низ мултибајтова.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3994,7 +4358,7 @@ msgstr ""
 "%s:%d: Дуги недовршени низ мултибајтова.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4003,7 +4367,7 @@ msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4012,7 +4376,7 @@ msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају реда.\n"
 "Наведите исправно кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4021,145 +4385,197 @@ msgstr ""
 "%s:%d: Неисправан низ мулти бајтова.\n"
 "Наведите кодирање извора помоћу „--from-code“\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: упозорење: литерал Регизраза је окончан прерано"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: упозорење: „%s“ није дозвољено"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: не могу да нађем окончање ниске „%s“ било где пре краја датотеке"
+msgstr ""
+"%s:%d: не могу да нађем окончање ниске „%s“ било где пре краја датотеке"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: недостаје десна заграда у „\\x{ХЕКСАДЕКАДНИ-БРОЈ}“"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправно уметање („\\l“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправно уметање („\\u“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неисправно уметање променљиве на „%c“"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправно уметање („\\L“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправно уметање („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неисправан низ мултибајтова.\n"
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Дуги недовршени низ мултибајтова.\n"
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Недовршени низ мултибајтова на крају реда.\n"
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неисправан низ мултибајтова.\n"
 "Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Непознато кодирање „%s“. Настављам са АСКРИ-јем."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неисправна одредница датотеке"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: недостаје број након #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неисправан израз ниске"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: неисправна одредница датотеке"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: неисправна одредница датотеке"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; уместо тога користите „eval_gettext“"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
+"уместо тога користите „eval_gettext“"
+
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: упозорење: литерал регуларног израза је окончан прерано"
@@ -4290,6 +4706,105 @@ msgstr "унутар напомене или упутства обраде"
 msgid "document ended unexpectedly: %s"
 msgstr "документ је завршио неочекивано: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: непозната опција „--%s“\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: опција „-W %s“ је нејасна\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: опција „-W %s“ захтева аргумент\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "упозорење: заглавље по датотеке је нејасно\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "упозорење: старија издања мсгфмт-а ће овде наићи на грешку\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Не-АСКРИ знак на %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Не-АСКРИ напомена на или пре %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Не-АСКРИ ниска на %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: упозорење: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Иако се користи на месту ниске записа, %s не представља исправну ниску "
+#~ "записа %s. Разлог: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Иако је објављена као таква, %s не представља исправну ниску записа %s. "
+#~ "Разлог: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "„%s“ запис ниске са неименованим аргументима не може бити исправно "
+#~ "локализован:\n"
+#~ "Преводилац не може да промени поредак аргумената.\n"
+#~ "Размотрите употребу ниску заоиса са именованим аргументима,\n"
+#~ "и са мапирањем уместо н-торке за аргументе.\n"
+
+#~ 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 ""
+#~ "Празан мсгид.  Ово је задржано за потребе Гнуовог геттекста-а:\n"
+#~ "„gettext(\"\")“ исписује поље заглавља са мета-подацима, а не\n"
+#~ "празну ниску.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "нејасана особеност аргумента за кључну реч „%.*s“"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "упозорење: недостаје контекст за кључниу реч „%.*s“"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "упозорење: недостаје контекст за аргумент множине кључне речи „%.*s“"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "контекст се разликује између облика за једнину и множину"
+
 #~ msgid "Missing context for the string extracted from '%s' element"
 #~ msgstr "Недостаје садржај за ниску извучену из елемента „%s“"
 
@@ -4312,8 +4827,10 @@ msgstr "документ је завршио неочекивано: %s"
 #~ msgid "%s:%d: fatal: plural message seen before singular message\n"
 #~ msgstr "%s:%d: кобно: порука множине је испред поруке једнине\n"
 
-#~ msgid "Invalid email address: need a fully qualified host name or domain name."
-#~ msgstr "Неисправна адреса ел. поште: потребно је пуно име домаћина или домен."
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr ""
+#~ "Неисправна адреса ел. поште: потребно је пуно име домаћина или домен."
 
 #~ msgid "Please confirm by pressing Return, or enter your email address."
 #~ msgstr "Потврдите притиском на Унеси, или унесите вашу адресу ел. поште."
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index 693ba2bb8..9134f2542 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -5,32 +5,33 @@
 # Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010, 2013, 2014
 # Göran Uddeborg <goeran@uddeborg.se>, 2016.
 #
-# $Revision: 1.4 $
+# $Revision: 1.6 $
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
-"PO-Revision-Date: 2016-06-06 19:03+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2016-06-16 22:01+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "ogiltigt argument %s för %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "tvetydigt argument %s för %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Giltiga argument är:"
 
@@ -58,152 +59,133 @@ msgstr "kan inte ta bort temporärkatalog %s"
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "bevarar rättigheter för %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, 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:195
+#: gnulib-lib/copy-file.c:179
 #, 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:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "fel uppstod då %s lästes"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "fel vid skrivning till %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() misslyckades"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Kompilator för C# hittades inte, försök installera pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Virtuell maskin för C# hittades inte, försök installera pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-barnprocess misslyckades"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan \"%s\" är tvetydig, alternativ:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: flaggan ”%s” är tvetydig\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"--%s\" tar inget argument\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan \"%s\" är tvetydig, alternativ:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: flaggan ”--%s” kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ogiltigt värde på argumentet target_version till compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, 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"
@@ -211,48 +193,49 @@ msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC
 #: gnulib-lib/javaexec.c:417
 #, c-format
 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"
+msgstr ""
+"Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fel i %s-barnprocess"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "skapa trådar misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning till %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "läsning från %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "kan inte initiera icke-blockerande I/O till barnprocess %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "kommunikation med %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s-barnprocess terminerade med slutstatus %d"
@@ -276,13 +259,13 @@ msgstr "%s-barnprocess terminerade med slutstatus %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "”"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "”"
 
@@ -291,64 +274,69 @@ msgstr "”"
 msgid "setting permissions for %s"
 msgstr "sätter rättigheter för %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan inte skapa rör"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle misslyckades"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan inte återställa filnummer %d: dup2 misslyckades"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s-barnprocess"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s-barnprocess fick ödesdiger signal %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Rotelementet måste vara <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Elementet <%s> innehåller inte ett <%s>-element"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Elementet <%s> har inte attributet <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Användning: %s [FLAGGA…] [LOKALREGLER]…\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -363,7 +351,7 @@ msgstr ""
 "LOKAL från REGLER och skriv dem i en form som passar för gettext att använda.\n"
 "Om inget argument anges, läser den CLDR plural-regler från standard in.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -372,27 +360,27 @@ msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 "Motsvarande gäller för frivilliga argument.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  skriv pluralregler i formatet CLDR\n"
 
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               visa versionsinformation och avsluta\n"
@@ -401,27 +389,33 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
-"Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
-
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+"Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv."
+"se>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -430,77 +424,80 @@ 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/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s kan inte läsas"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "kan inte extrahera regler för %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "kan inte tolka CLDR-regel"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "extra operand %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fel uppstod när \"%s\" öppnades för läsning"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "formateringsdirektiv för argument %u, som i \"%s\", finns inte i \"%s\""
+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 \"%s\""
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "formateringsdirektivet i \"%s\" och \"%s\" för argument %u är inte likadana"
+msgstr ""
+"formateringsdirektivet i \"%s\" och \"%s\" för argument %u är inte likadana"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktiv nummer %u börjar med | men avslutas inte med |."
@@ -512,56 +509,71 @@ msgstr ""
 "\"%s\" är inte en giltig formatsträng i %s, till skillnad från \"%s\".\n"
 "Orsak: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "I direktiv nummer %u är symbolen efter \"<\" inte namn på ett formateringsmakro. Giltiga makronamn är definierade i ISO C 99, kapitel 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"I direktiv nummer %u är symbolen efter \"<\" inte namn på ett "
+"formateringsmakro. Giltiga makronamn är definierade i ISO C 99, kapitel "
+"7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "I direktiv nummer %u följs symbolen efter \"<\" inte av \">\"."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"Strängen refererar till argument nummer %u men ignorerar argument nummer %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antalet formateringsdirektiv i \"%s\" och \"%s\" är olika"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "I direktiv nummer %u följs inte \"{\" av ett argumentnummer."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "I direktiv nummer %u följs inte \",\" av ett nummer."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Strängen slutar mitt i ett direktiv: hittade \"{\" utan tillhörande \"}\"."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Strängen slutar mitt i ett direktiv: hittade \"{\" utan tillhörande \"}\"."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-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 \"}\"."
+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 "
+"\"}\"."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Direktiv nummer %u avslutas med ett ogiltigt tecken istället för \"}\"."
+msgstr ""
+"Direktiv nummer %u avslutas med ett ogiltigt tecken istället för \"}\"."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Strängen startar mitt i ett direktiv: hittade \"}\" utan tillhörande \"{\"."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Strängen startar mitt i ett direktiv: hittade \"}\" utan tillhörande \"{\"."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Strängen innehåller ett ensamt \"}\" efter direktiv nummer %u."
@@ -578,13 +590,19 @@ msgstr "I direktiv nummer %u: en precision är inte tillåten före \"%c\"."
 
 #: 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."
+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:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "I direktiv nummer %u: en precisionsspecifikation är inte tillåten före \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"I direktiv nummer %u: en precisionsspecifikation är inte tillåten före \"%c"
+"\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -621,93 +639,133 @@ msgid "The string ends in the middle of a directive."
 msgstr "Strängen avslutas mitt i ett direktiv."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Strängen refererar till argument både via absoluta argumentnummer och via onumrerade argumentspecifikationer."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Strängen refererar till argument både via absoluta argumentnummer och via "
+"onumrerade argumentspecifikationer."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "I direktiv nummer %u är inte argument nummer 0 ett positivt heltal."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "I direktiv nummer %u är inte breddens argument nummer 0 ett positivt heltal."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"I direktiv nummer %u är inte breddens argument nummer 0 ett positivt heltal."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "I direktiv nummer %u är inte precisionens argument nummer 0 ett positivt heltal."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"I direktiv nummer %u är inte precisionens argument nummer 0 ett positivt "
+"heltal."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "I direktiv nummer %u är inte tecknet \"%c\" en giltig konvertering."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Tecknet som avslutar direktiv nummer %u är inte en giltig konvertering."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Tecknet som avslutar direktiv nummer %u är inte en giltig konvertering."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Strängen refererar till argument nummer %u på inkompatibla sätt."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "I direktiv nummer %u är delsträngen \"%s\" inte en giltig datum/tid-stil."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"I direktiv nummer %u är delsträngen \"%s\" inte en giltig datum/tid-stil."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "I direktiv nummer %u följs inte \"%s\" av ett komma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "I direktiv nummer %u är delsträngen \"%s\" inte en giltig nummerstil."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "I direktiv nummer %u följs inte argumentnumret av ett komma och en av \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"I direktiv nummer %u följs inte argumentnumret av ett komma och en av \"%s"
+"\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "I direktiv nummer %u innehåller ett val inga nummer."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "I direktiv nummer %u innehåller ett val ett nummer som inte följs av \"<\", \"#\" eller \"%s\"."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"I direktiv nummer %u innehåller ett val ett nummer som inte följs av \"<\", "
+"\"#\" eller \"%s\"."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-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 \"%s\""
+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 \"%s\""
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "formateringsdirektiv i \"%s\" och \"%s\" för argument {%u} är inte likadana"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"formateringsdirektiv i \"%s\" och \"%s\" för argument {%u} är inte likadana"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Strängen refererar till argument nummer %u men ignorerar argument nummer %u och %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Strängen refererar till argument nummer %u men ignorerar argument nummer %u "
+"och %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "formateringsdirektiv för argument %u och %u finns inte i ”%s”, endast ett argument kan ignoreras"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"formateringsdirektiv för argument %u och %u finns inte i ”%s”, endast ett "
+"argument kan ignoreras"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -718,15 +776,27 @@ msgstr "fel vid tolkning: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "I direktiv nummer %u har parameter %u typ \"%s\" men en parameter av typ \"%s\" förväntades."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"I direktiv nummer %u har parameter %u typ \"%s\" men en parameter av typ \"%s"
+"\" förväntades."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "I direktiv nummer %u anges för många parametrar, förväntade högst %u parameter."
-msgstr[1] "I direktiv nummer %u anges för många parametrar, förväntade högst %u parametrar."
+msgid ""
+"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."
+msgstr[0] ""
+"I direktiv nummer %u anges för många parametrar, förväntade högst %u "
+"parameter."
+msgstr[1] ""
+"I direktiv nummer %u anges för många parametrar, förväntade högst %u "
+"parametrar."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -756,8 +826,11 @@ msgstr "I direktiv nummer %u anges båda modifierarna @ och :."
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "I direktiv nummer %u följs inte \"~:[\" av två satser separerade med \"~;\"."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"I direktiv nummer %u följs inte \"~:[\" av två satser separerade med \"~;\"."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -779,15 +852,19 @@ 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 \"%s\""
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "I direktiv nummer %u är storleksbestämningen inkompatibel med konverteringen \"%c\"."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"I direktiv nummer %u är storleksbestämningen inkompatibel med konverteringen "
+"\"%c\"."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -806,8 +883,11 @@ msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett getitem-argument."
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "I direktiv nummer %u är ytterligare nästning inte tillåten i en formatspecifikation."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"I direktiv nummer %u är ytterligare nästning inte tillåten i en "
+"formatspecifikation."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -815,8 +895,12 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "I direktiv nummer %u finns ett oavslutat formatdirektiv."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Strängen refererar till argument både via argumentnamn och via namnlösa argumentspecifikationer."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Strängen refererar till argument både via argumentnamn och via namnlösa "
+"argumentspecifikationer."
 
 #: src/format-python.c:354
 #, c-format
@@ -825,112 +909,138 @@ msgstr "Strängen refererar till argumentet \"%s\" på inkompatibla sätt."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "formateringsdirektiv i \"%s\" tar en avbildning, de i \"%s\" tar en tupel"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"formateringsdirektiv i \"%s\" tar en avbildning, de i \"%s\" tar en tupel"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "formateringsdirektiv i \"%s\" tar en tupel, de i \"%s\" tar en avbildning"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"formateringsdirektiv i \"%s\" tar en tupel, de i \"%s\" tar en avbildning"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "formateringsdirektiv för argument \"%s\", som i \"%s\", finns inte i \"%s\""
+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 \"%s\""
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "formateringsdirektiv i \"%s\" och \"%s\" för argument \"%s\" är inte likadana"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"formateringsdirektiv i \"%s\" och \"%s\" för argument \"%s\" är inte likadana"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "\"%s\" är en enkel formatsträng, men \"%s\" är inte det; den innehåller en \"L\"-flagga eller ett tvåsiffrigt argumenttal"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"\"%s\" är en enkel formatsträng, men \"%s\" är inte det; den innehåller en "
+"\"L\"-flagga eller ett tvåsiffrigt argumenttal"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Strängen refererar till en skalvariabel med ett namn utanför ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Strängen refererar till en skalvariabel med komplex skalklammersyntax.  Denna syntax stödjs inte här av säkerhetsskäl."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Strängen refererar till en skalvariabel med komplex skalklammersyntax.  "
+"Denna syntax stödjs inte här av säkerhetsskäl."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Strängen refererar till en skalvariabel vars värde kan vara annorlunda inne i skalfunktioner."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Strängen refererar till en skalvariabel vars värde kan vara annorlunda inne "
+"i skalfunktioner."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Strängen refererar till en skalvariabel utan namn."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "I direktiv nummer %u är tecknet \"%c\" inte en siffra mellan 1 och 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Användning: %s [FLAGGA]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Visa maskinens värdnamn.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Resultatformat:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 kort värdnamn\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          långt värdnamn, innehåller hela domännamnet\n"
 "                                och alias\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser för värdnamnet\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "kunde inte hämta värdnamn"
@@ -940,7 +1050,7 @@ msgstr "kunde inte hämta värdnamn"
 msgid "selector is not specified"
 msgstr "selektorn är inte angiven"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "kan inte skapa XPath-kontext"
@@ -950,28 +1060,28 @@ msgstr "kan inte skapa XPath-kontext"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "kan inte evaluera XPath-uttryck: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "”%s”-nod innehåller inte ”%s”"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "ogiltigt attributvärde ”%s” för ”%s”"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "rotelementet är inte ”rules” under namnrymden %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan inte läsa %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "kan inte evaluera XPath-platssökväg: %s"
@@ -991,28 +1101,28 @@ msgstr "kan inte läsa XML-filen %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "rotelementet är inte ”locatingRules”"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "högst en infil tillåten"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s och %s är ömsesidigt uteslutande"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1021,127 +1131,144 @@ msgstr ""
 "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n"
 "manipulerar attributen.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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"
+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:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Plats för infiler:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-infil\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+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:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Om ingen infil är angiven eller om den är -, läses standard in.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Plats för utfil:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n"
+msgstr ""
+"Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelandeval:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            behåll översatta, ta bort oöversatta meddelanden\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            behåll översatta, ta bort oöversatta "
+"meddelanden\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          behåll oöversatta, ta bort översatta meddelanden\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          behåll oöversatta, ta bort översatta "
+"meddelanden\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              ta bort meddelanden markerade som \"fuzzy\"\n"
+msgstr ""
+"      --no-fuzzy              ta bort meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            behåll meddelanden markerade som \"fuzzy\"\n"
+msgstr ""
+"      --only-fuzzy            behåll meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ta bort föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         behåll föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attributmanipulation:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             markera alla meddelanden som \"fuzzy\"\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           ta bort \"fuzzy\"-markering från alla meddelanden\n"
+msgstr ""
+"      --clear-fuzzy           ta bort \"fuzzy\"-markering från alla "
+"meddelanden\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          markera alla meddelanden som föråldrade\n"
+msgstr ""
+"      --set-obsolete          markera alla meddelanden som föråldrade\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        ta bort föråldradmarkering från alla meddelanden\n"
+msgstr ""
+"      --clear-obsolete        ta bort föråldradmarkering från alla "
+"meddelanden\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1150,158 +1277,187 @@ msgstr ""
 "      --previous              när \"fuzzy\" är satt, behåll föregående\n"
 "                              \"msgid\" för översatta meddelanden\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        ta bort \"previous msgid\" från alla meddelanden\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        ta bort \"previous msgid\" från alla "
+"meddelanden\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 när \"fuzzy\" tas bort, sätt msgstr till tom sträng\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 när \"fuzzy\" tas bort, sätt msgstr till tom "
+"sträng\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, 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"
+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:485
+#: src/msgattrib.c:484
 #, 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"
+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:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 samma som --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              samma som --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              samma som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax på infil:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+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:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     infil har NeXTstep/GNUstep \".strings\"-syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     infil har NeXTstep/GNUstep \".strings\"-"
+"syntax\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 använd alltid färger och andra textattribut\n"
-"      --color=NÄR             använd färger och andra textattribut beroende på\n"
+"      --color=NÄR             använd färger och andra textattribut beroende "
+"på\n"
 "                              NÄR, som kan vara ”always”, ”never”, ”auto”\n"
 "                              eller ”html”.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STILMALL        ange CSS stilmallsfil för --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                använd C-kontrollsekvenser i resultatet, men\n"
 "                                inga utökade tecken\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
+msgstr ""
+"      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          skriv rader med \"#: filnamn:rad\" (normalläge)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          skriv rader med \"#: filnamn:rad"
+"\" (normalläge)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    skriv en NeXTstep/GNUstep \".strings\"-fil\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    skriv en NeXTstep/GNUstep \".strings\"-fil\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1310,31 +1466,31 @@ msgstr ""
 "      --no-wrap               dela inte meddelanden som är längre än\n"
 "                              resultatets kolumnantal i flera rader\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortera resultatet\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1357,23 +1513,23 @@ msgstr ""
 "ihop,  utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
 "definierar dem.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   infiler\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Om infil är - läses standard in.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1382,7 +1538,7 @@ msgstr ""
 "  -<, --less-than=ANTAL       skriv meddelanden med färre än ANTAL\n"
 "                              definitioner. Standardvärde: oändligt\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1391,7 +1547,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1400,26 +1556,30 @@ msgstr ""
 "  -u, --unique                samma som --less-than=2, begär att\n"
 "                              endast unika meddelanden skrivs\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      infiler har \"Java .properties\"-syntax\n"
+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:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     infiler har NeXTstep/GNUstep \".strings\"-syntax\n"
+msgstr ""
+"      --stringtable-input     infiler har NeXTstep/GNUstep \".strings\"-"
+"syntax\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMN          kodning för resultatet\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1428,32 +1588,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:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOGNAMN      sätt \"Language\"-fältet i huvudet\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "inga infiler givna"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exakt 2 infiler krävs"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Användning: %s [FLAGGA] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1471,84 +1632,87 @@ 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:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      översättningar\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referenser till källkod\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Bearbetningsvarianter:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          tillämpa ref.pot till alla domäner i def.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          tillämpa ref.pot till alla domäner i def.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             använd luddiga poster i resultatet\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      beakta oöversatta meddelanden\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "detta meddelande är oöversatt"
 
-#: src/msgcmp.c:331
+#: 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:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "detta meddelande används men är inte definierat..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denna definition är likartad"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst två filer måste anges"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1569,7 +1733,7 @@ msgstr ""
 "endast från den första PO-filen som definierar dem. Filpositioner från\n"
 "alla filer bevaras.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1578,65 +1742,70 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr "      --omit-header           skriv inte ut huvudet med `msgid \"\"'\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Konverteringsmål:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Standardvärde är nuvarande lokals kodning.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
+msgstr ""
+"      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          bevara rader med \"#: filnamn:rad\" (normalläge)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          bevara rader med \"#: filnamn:rad"
+"\" (normalläge)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "inga infiler givna"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "exakt en infil krävs"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Användning: %s [FLAGGA] INFIL\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1648,22 +1817,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:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INFIL                       PO- eller POT-infil\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "kommandonamn saknas"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Användning: %s [FLAGGA] KOMMANDO [KOMMANDOFLAGGOR]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1678,7 +1847,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:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1688,47 +1857,48 @@ msgstr ""
 "av ett nolltecken.  Utdata för \"msgexec 0\" är lämpligt som indata för\n"
 "\"xargs -O\"\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Kommandoindata:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   lägg till en nyrad vid slutet av indata\n"
+msgstr ""
+"  --newline                   lägg till en nyrad vid slutet av indata\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INFIL           PO-infil\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning till standard ut misslyckades"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "filternamn saknas"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst ett sed-skript måste anges"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, 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:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1737,12 +1907,12 @@ 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:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Filterindata och -utdata:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1751,242 +1921,282 @@ msgstr ""
 "  --newline                   lägg till en nyrad till slutet av indata och\n"
 "                                ta bort en nyrad från slutet av utdata"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, 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"
+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:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=SKRIPTFIL        lägg till innehållet i SKRIPTFIL till kommandon\n"
+"  -f, --file=SKRIPTFIL        lägg till innehållet i SKRIPTFIL till "
+"kommandon\n"
 "                                att exekvera\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       undertryck automatisk utskrift av mönsterutrymmet\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       undertryck automatisk utskrift av "
+"mönsterutrymmet\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indentera resultatet\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           bevara huvudrader oförändrade, filtrera dem inte\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           bevara huvudrader oförändrade, filtrera dem "
+"inte\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "filterutdata avslutas inte med en nyrad"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, 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:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ogiltig byteordning: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "ingen infil ska anges om %s och %s är givna"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s kräver att \"--template mall\" anges"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s kräver att \"-o fil\" anges"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s och %s är ömsesidigt uteslutande i %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, 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:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan inte hitta ITS-regler för %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d översatt meddelande"
 msgstr[1] "%d översatta meddelanden"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, 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:888
+#: src/msgfmt.c:886
 #, 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:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Generera en binär meddelandekatalog från en textuell beskrivning av översättning.\n"
+msgstr ""
+"Generera en binär meddelandekatalog från en textuell beskrivning av "
+"översättning.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnamn.po ...              infiler\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Körläge:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Javaläge: generera en Java ResourceBundle-"
+"klass\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Javaläge: generera en Java ResourceBundle-klass\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 som --java, och anta Java2 (JDK 1.2 eller "
+"högre)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 som --java, och anta Java2 (JDK 1.2 eller högre)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-resursläge: generera en .NET .resources-"
+"fil\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-resursläge: generera en .NET .resources-fil\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-läge: generera en .msg-fil av tcl/msgcat-"
+"typ\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-läge: generera en .msg-fil av tcl/msgcat-typ\n"
-
-#: src/msgfmt.c:943
-#, 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:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               \"Desktop Entry\"-läge: generera en .desktop-fil\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               \"Desktop Entry\"-läge: generera en .desktop-"
+"fil\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML-läge: generera en XML-fil\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Om utfilen är - skrivs resultatet till standard ut.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Plats för utfil i Javaläge:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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=LOKAL          lokalnamn, antingen språk eller språk_LAND\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOKAL          lokalnamn, antingen språk eller språk_LAND\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                generera en .java-fil istället för en .class-fil\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                generera en .java-fil istället för en .class-"
+"fil\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d KATALOG                  startkatalog för klassers katalogträd\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1994,36 +2204,41 @@ msgstr ""
 "avskiljt med ett understreck.  Flaggan -d är obligatorisk.  Klassen skrivs\n"
 "till den givna katalogen.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Plats för utfil i C#-läge:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d KATALOG                  startkatalog för lokalberoende .dll-filer\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d KATALOG                  startkatalog för lokalberoende .dll-filer\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, 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 ""
-"Flaggorna -l och -d är obligatoriska.  .dll-filen skrivs till en underkatalog\n"
+"Flaggorna -l och -d är obligatoriska.  .dll-filen skrivs till en "
+"underkatalog\n"
 "till den angivna katalogen vars namn beror på lokalen.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Plats för utfil i Tcl-läge:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 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"
+msgstr ""
+"  -d KATALOG                  startkatalog för .msg-meddelandekataloger\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2032,22 +2247,22 @@ msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .msg-filen skrivs till den givna\n"
 "katalogen.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Flaggor för \"Desktop Entry\"-läge\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=MALL             en .desktop-fil att använda som mall\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d KATALOG                  baskatalog för .po-filer\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2056,55 +2271,62 @@ msgstr ""
 "  -kORD, --keyword=ORD        sök efter ORD som ett extra nyckelord\n"
 "  -k, --keyword               använd inte standardnyckelord\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Flaggorna -l, -o och --template är obligatoriska.  Om -D är given så läses\n"
 "indatafiler från katalogen och inte från kommandoradsargument.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML-lägesflaggor:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAMN         känn igen det angivna XML-språket\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=MALL             en XML-fil använd som en mall\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning av infil:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 utför alla kontroller som bestäms av\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          kontrollera språkberoende formatsträngar\n"
+msgstr ""
+"      --check-format          kontrollera språkberoende formatsträngar\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          verifiera närvaro och innehåll av huvudrader\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          verifiera närvaro och innehåll av huvudrader\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2113,133 +2335,140 @@ msgstr ""
 "      --check-domain          kontrollera konflikter mellan domändirektiv\n"
 "                                och flaggan --output-file\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   kontrollera att GNU msgfmt uppför sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=TKN]   kontrollera närvaron av tangentkortkommandon\n"
+"      --check-accelerators[=TKN]   kontrollera närvaron av "
+"tangentkortkommandon\n"
 "                                för menyer\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, 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:1060
+#: src/msgfmt.c:1058
 #, 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"
+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:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=BYTEORDN   skriv 32-bitarstal i given byteordning\n"
-"                                (big eller little, standard beror på plattform)\n"
+"                                (big eller little, standard beror på "
+"plattform)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+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:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            skriv ut statistik om översättningarna\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 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:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, 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:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "varning: PO-filens huvudrader är luddiga\n"
-
-#: src/msgfmt.c:1204
-#, 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"
+msgstr ""
+"varning: konvertering till användarens teckenuppsättning kommer att "
+"misslyckas.\n"
 
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, 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:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s finns men kan inte läsas"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "flagga \"%c\" kan inte användas förrän \"J\", \"K\", \"T\" \"C\" eller \"X\" angivits"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"flagga \"%c\" kan inte användas förrän \"J\", \"K\", \"T\" \"C\" eller \"X\" "
+"angivits"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2248,7 +2477,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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2324,34 +2553,41 @@ msgstr ""
 "  -v, --invert-match          skriv ut endast de meddelanden som inte matchar\n"
 "                              något urvalskriteria.\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                använd C-kontrollsekvenser i resultatet, men\n"
-"                                inte \\v eller \\a\n"
+"                                inga utökade tecken\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sortera resultatet\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sortera resultatet efter filposition\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Du befinner dig i en språkoberoende miljö.  Sätt din miljövariabel\n"
 "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:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2362,12 +2598,12 @@ msgstr ""
 "Ange lokal med flaggan --locale eller\n"
 ".po-utfilen med flaggan --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Skapade %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2376,26 +2612,28 @@ msgstr ""
 "Skapar en ny PO-fil och initierar metainformation med värden från\n"
 "användarens miljövariabler.\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INFIL           POT-infil\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Om ingen infil ges söks POT-filen i aktuell katalog.\n"
 "Om den är - läses standard in.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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"
+msgstr ""
+"  -o, --output-file=FIL       skriv resultatet till den givna PO-filen\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2404,17 +2642,19 @@ 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:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          sätt mållokal\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         antag att PO-filen är automatgenererad\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2422,12 +2662,12 @@ msgstr ""
 "Hittade fler än en .pot-fil.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "fel vid läsning av aktuell katalog"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2435,17 +2675,19 @@ msgstr ""
 "Hittade ingen .pot-fil i aktuell katalog.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-barnprocess terminerade med slutstatus %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Den nya meddelandekatalogen bör innehålla din e-postadress så att\n"
@@ -2455,44 +2697,48 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Svenska översättningar för paket %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+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:208
+#: 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 "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2501,10 +2747,11 @@ msgstr ""
 "Infiler har meddelanden med flera kodningar, däribland UTF-8.\n"
 "Konverterar resultatet till UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2512,7 +2759,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:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2521,12 +2768,12 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 "Konvertering av filen %s från teckenkodning %s till teckenkodning %s ändrar\n"
-"några msgid:s eller msgctxt:s.\n"
-"Antingen ändrar du alla msgid:s och msgctxt:s till att bara innehålla ASCII\n"
-"eller se till att de är UTF-8-kodade från början, d.v.s. redan i dina\n"
-"källkodsfiler.\n"
+"några msgid:er eller msgctxt:er.\n"
+"Ändra antingen alla msgid:er och msgctxt:er till att bara innehålla ASCII "
+"eller\n"
+"se till att de är UTF-8-kodade från början, d.v.s. redan i källkodsfilerna.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2539,12 +2786,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:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2555,7 +2802,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:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2568,7 +2815,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:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2597,7 +2844,9 @@ msgid "plural expression can produce integer overflow"
 msgstr "pluraluttryck kan ge heltalsspill"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+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:270
@@ -2645,10 +2894,14 @@ msgstr[0] "men några meddelanden har en pluralform"
 msgstr[1] "men några meddelanden har %lu pluralformer"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"meddelandekatalog har översättningar med pluralformer, men saknar huvudrad "
+"med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 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\""
 
@@ -2657,11 +2910,11 @@ msgstr "\"msgid\"- och \"msgid_plural\"-raderna börjar inte båda med \"\\n\""
 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:638
+#: src/msgl-check.c:639
 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:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\""
 
@@ -2670,11 +2923,11 @@ msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\""
 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:679
+#: src/msgl-check.c:680
 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:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "hantering av plural är en utökning i GNU gettext"
 
@@ -2706,15 +2959,15 @@ msgstr "ASCII-ellips (”...”) istället för Unicode"
 msgid "space before ellipsis found in user visible strings"
 msgstr "mellanrum före ellips i användarsynliga strängar"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII dubbelt citationstecken använt istället för Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "ASCII enkelt citationstecken använt istället för Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "ASCII-punkt (”%c”) istället för Unicode"
@@ -2727,43 +2980,53 @@ msgstr "%s: indata är inte giltig i teckenkodningen \"%s\""
 #: 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\""
+msgstr ""
+"%s: fel uppstod vid konvertering från teckenuppsättning \"%s\" till "
+"teckenuppsättning \"%s\""
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 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:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 msgstr ""
-"Kan inte konvertera från \"%s\" till \"%s\".  %s beror på iconv()\n"
-"och iconv() stöder inte denna konvertering."
+"Kan inte konvertera från ”%s” till ”%s”.  %s beror på iconv(), och iconv() "
+"stödjer inte denna konvertering."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Konvertering från \"%s\" till \"%s\" ger duplikat: några msgid som skiljer sig blir lika."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konvertering från \"%s\" till \"%s\" ger duplikat: några msgid som skiljer "
+"sig blir lika."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 msgstr ""
 "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n"
 "Denna version byggdes utan iconv()."
 
-#: src/msgmerge.c:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s är endast giltig med %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "säkerhetskopieringstyp"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2786,17 +3049,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:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      översättningar som refererar till gamla källkoden\n"
+msgstr ""
+"  def.po                      översättningar som refererar till gamla "
+"källkoden\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referenser till den nya källkoden\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2805,7 +3070,7 @@ msgstr ""
 "  -C, --compendium=FIL        ytterligare kataloger med översättningar,\n"
 "                              kan anges flera gånger\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2814,30 +3079,31 @@ msgstr ""
 "  -U, --update                uppdatera def.po,\n"
 "                              gör ingenting om def.po redan är aktuell\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Plats för utfil i uppdateringsläge:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Resultatet skrivs tillbaka till def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, 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:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2848,123 +3114,152 @@ msgstr ""
 "VERSION_CONTROL.  Här är värdena:\n"
 "  none, off       gör aldrig säkerhetskopior (även om --backup ges)\n"
 "  numbered, t     gör numrerade säkerhetskopior\n"
-"  existing, nil   numrerade säkerhetskopior om det finns sådana, enkla annars\n"
+"  existing, nil   numrerade säkerhetskopior om det finns sådana, enkla "
+"annars\n"
 "  simple, never   gör alltid enkla säkerhetskopior\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 känn igen Boost-formatsträngar\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              behåll föregående \"msgid\" för översatta meddelanden\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              behåll föregående \"msgid\" för översatta "
+"meddelanden\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       visa inte förloppsindikatorer\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "detta meddelande ska definiera pluralformer"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "detta meddelande ska inte definiera pluralformer"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld saknade, %ld föråldrade.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld "
+"saknade, %ld föråldrade.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " klar.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Användning: %s [FLAGGA] [FIL]...\n"
 
-#: src/msgunfmt.c:432
+#: 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"
+msgstr ""
+"Konvertera en binär meddelandekatalog till en .po-fil av Uniforum-typ.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Javaläge: indata är en Java ResourceBundle-klass\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Javaläge: indata är en Java ResourceBundle-"
+"klass\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C#-resursläge: indata är en .NET .resources-fil\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C#-resursläge: indata är en .NET .resources-"
+"fil\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl-läge: indata är en .msg-fil av tcl/msgcat-typ\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl-läge: indata är en .msg-fil av tcl/msgcat-"
+"typ\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FIL ...                     .mo-infiler\n"
 
-#: src/msgunfmt.c:457
+#: 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:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 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:468
+#: 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:476
+#: 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 ""
-"Flaggorna -l och -d är obligatoriska.  .dll-filen skrivs till en underkatalog\n"
-"till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
+"Flaggorna -l och -d är obligatoriska.  .dll-filen placeras i en\n"
+"underkatalog till den givna katalogen vars namn beror på lokalen.\n"
 
-#: src/msgunfmt.c:480
+#: 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:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2973,17 +3268,17 @@ msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .msg-filen ligger i den givna\n"
 "katalogen.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2998,24 +3293,26 @@ msgstr ""
 "Slår samman duplicerade översättningar i en meddelandekatalog.\n"
 "Hittar duplicerade översättningar med samma meddelande-id (msgid).  Sådana\n"
 "duplikat är ogiltig indata för andra program såsom msgfmt, msgmerge\n"
-"eller msgcat.  I normalläge slås duplikat ihop.\n"
-"När flaggan --repeated används skrivs bara duplikat och alla andra\n"
-"meddelanden kastas bort.  Kommentarer och extraherade kommentarer\n"
-"samlas ihop, utom när --use-first ges.  Då tas de endast från den första\n"
-"översättningen.  Filpositioner samlas ihop.\n"
+"eller msgcat.  I normalläge slås duplikat ihop.  När flaggan --repeated\n"
+"används skrivs bara duplikat och alla andra meddelanden kastas bort.\n"
+"Kommentarer och extraherade kommentarer samlas ihop, utom när --use-first\n"
+"anges, då de tas från den första översättningen.  Filpositioner samlas ihop.\n"
 "När flaggan --unique anges kastas duplikat bort.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              skriv bara duplicerade meddelanden\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                skriv bara unika meddelanden, duplikat kastas\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                skriv bara unika meddelanden, duplikat kastas\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3069,34 +3366,35 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Teckenuppsättning saknas i huvudet.\n"
-"Meddelandekonvertering till användarens teckenuppsättning kommer att misslyckas.\n"
+"Meddelandekonvertering till användarens teckenuppsättning kommer att "
+"misslyckas.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inkonsekvent användning av #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "\"msgstr[]\"-delen saknas"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "\"msgid_plural\"-delen saknas"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "\"msgstr\"-delen saknas"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "första pluralformen har index som inte är noll"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "pluralform har fel index"
@@ -3106,7 +3404,7 @@ msgstr "pluralform har fel index"
 msgid "too many errors, aborting"
 msgstr "för många fel, avbryter körningen"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ogiltig flerbytesekvens"
@@ -3116,41 +3414,41 @@ msgstr "ogiltig flerbytesekvens"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ofullständig flerbytesekvens i slutet på filen"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ofullständig flerbytesekvens i slutet på raden"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv misslyckades"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nyckelordet \"%s\" är okänt"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "ogiltig kontrollsekvens"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "filslut inne i en sträng"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "radslut inne i en sträng"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontextseparator <EOT> inne i sträng"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denna fil kan inte innehålla domändirektiv"
@@ -3180,7 +3478,7 @@ msgstr "”=” saknas efter ”%s”"
 msgid "invalid non-blank line"
 msgstr "ogiltig icke-tom rad"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" är avkortad"
@@ -3190,29 +3488,46 @@ msgstr "filen \"%s\" är avkortad"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen \"%s\" är inte på GNUs .mo-format"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet vid %s"
+msgstr ""
+"filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet vid %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "varning: ogiltig \\uxxxx-syntax för Unicodetecken"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: varning: ensamt surrogat U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "varning: ogiltigt Unicodetecken"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "varning: oavslutad sträng"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "varning: syntaxfel"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "varning: oavslutat nyckel/värde-par"
 
@@ -3220,11 +3535,11 @@ msgstr "varning: oavslutat nyckel/värde-par"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "varning: syntaxfel, \";\" förväntades efter sträng"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "varning: syntaxfel, \"=\" eller \";\" förväntades efter sträng"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Skrivet av %s och %s.\n"
@@ -3233,16 +3548,16 @@ msgstr "Skrivet av %s och %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Omkoda serbisk text från kyrillisk till latinsk kodning.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3251,27 +3566,29 @@ msgstr ""
 "Indatatexten läses från standard in. Den konverterade texten skrivs till\n"
 "standard ut.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "indata är inte giltig i teckenkodningen \"%s\""
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "fel uppstod vid konvertering från teckenuppsättning \"%s\" till teckenuppsättning \"%s\""
+msgstr ""
+"fel uppstod vid konvertering från teckenuppsättning \"%s\" till "
+"teckenuppsättning \"%s\""
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "förväntade två argument"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Användning: %s [FLAGGA] URL FIL\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3280,114 +3597,136 @@ 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:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "fel vid skrivning till standard ut"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fel efter \"%s\" lästes"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Hämtar %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " tiden tog slut.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " misslyckades.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Kan inte skriva ut flera översättningsdomäner till en enstaka fil med det angivna resultatformatet. Försök använda PO-filsyntax istället."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Kan inte skriva ut flera översättningsdomäner till en enstaka fil med det "
+"angivna resultatformatet. Försök använda PO-filsyntax istället."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Kan inte skriva ut flera översättningsdomäner till en enstaka fil med det angivna resultatformatet."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Kan inte skriva ut flera översättningsdomäner till en enstaka fil med det "
+"angivna resultatformatet."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "meddelandekatalog har kontextberoende översättningar, men resultatformatet stöder inte dem."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"meddelandekatalog har kontextberoende översättningar, men resultatformatet "
+"stöder inte dem."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
 msgstr ""
 "meddelandekatalog har översättningar med pluralformer, men resultatformatet\n"
 "stöder inte dem. Försök generera en Java-klass med \"msgfmt --java\"\n"
 "istället för en \"properties\"-fil."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "meddelandekatalog har översättningar med pluralformer, men utdataformatet stöder inte pluralhantering."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"meddelandekatalog har översättningar med pluralformer, men utdataformatet "
+"stöder inte pluralhantering."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan inte skapa utfilen \"%s\""
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "misslyckades med att skapa katalogen \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, 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:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilering av C#-klass misslyckades"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "inte ett giltigt Javaklassnamn: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, 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"
+msgstr ""
+"kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "ofullständig flerbytesekvens"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3400,7 +3739,7 @@ msgstr ""
 "teckenuppsättning än du.  Försök använda en ren ASCII-msgctxt istället.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3423,7 +3762,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3441,12 +3781,12 @@ msgstr ""
 "men formatet för meddelandekataloger i Qt stöder Unicode endast i de\n"
 "översatta strängarna, inte i de oöversatta strängarna\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "fel vid skrivning till barnprocess %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3454,7 +3794,7 @@ msgstr ""
 "meddelandekatalog har kontextberoende översättningar men formatet för\n"
 "C# .resources stöder inte kontexter\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3462,7 +3802,7 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer men formatet för\n"
 "C# .resources stöder inte pluralhantering\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3470,7 +3810,7 @@ msgstr ""
 "meddelandekatalog har kontextberoende översättningar men formatet för\n"
 "Tcl-meddelandekataloger stöder inte kontexter\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3478,36 +3818,56 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer men formatet för\n"
 "Tcl-meddelandekataloger stöder inte pluralhantering\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "varning: ogiltigt Unicodetecken"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: varning: ogiltigt Unicodetecken"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: varning: oavslutad sträng"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: varning: oavslutad sträng"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varning: oavslutad teckenkonstant"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Ange källkodning med --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3516,7 +3876,7 @@ msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3525,7 +3885,7 @@ msgstr ""
 "%s:%d: Lång ofullständig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3534,7 +3894,7 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid filslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3543,12 +3903,12 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv misslyckades"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3557,119 +3917,139 @@ msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: varning: ogiltigt Unicodetecken"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: varning: oavslutad strängkonstant"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: varning: \")\" hittades där \"}\" förväntades"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varning: \"}\" hittades där \")\" förväntades"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "%s är inte ett giltigt kodningsnamn.  Använder ASCII som reservalternativ\n"
+msgstr "”%s” är inte ett giltigt kodningsnamn.  Faller tillbaka på ASCII.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "syntaxkontrollen ”%s” okänd"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "meningens sluttyp ”%s” okänd"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, 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"
+msgstr ""
+"--join-existing kan inte användas då resultatet skrivs till standard ut"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, 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:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "varning: ITS-regelfilen ”%s” finns inte"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "varning: ITS-regelfilen ”%s” finns inte; kontrollera din gettext-installation"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"varning: ITS-regelfilen ”%s” finns inte; kontrollera din gettext-installation"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, 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:1040
+#: src/xgettext.c:1027
 #, 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:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAMN  använd NAMN.po som utfil (i st.f. messages.po) \n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=NAMN   använd NAMN.po som utfil (istället för "
+"messages.po)\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+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:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Språkval i infiler:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAMN         känn igen angivet språk\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   samma som --language=C++\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+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:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3678,35 +4058,39 @@ msgstr ""
 "      --from-code=NAMN        kodning av infiler\n"
 "                                (utom för Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, 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:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         slå ihop meddelanden med existerande fil\n"
+msgstr ""
+"  -j, --join-existing         slå ihop meddelanden med existerande fil\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, 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:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cMÄRKE, --add-comments=MÄRKE  skriv kommentarsblock som börjar med MÄRKE\n"
-"                                 och föregående nyckelordsrader till resultatet\n"
-"  -c, --add-comments             skriv alla kommentarsblock före nyckelordsrader\n"
+"                                 och föregående nyckelordsrader till "
+"resultatet\n"
+"  -c, --add-comments             skriv alla kommentarsblock före "
+"nyckelordsrader\n"
 "                                 till resultatet\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3717,7 +4101,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3728,241 +4112,193 @@ msgstr ""
 "                                (single-space, som är standard, \n"
 "                                 eller double-space)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Språkspecifika val:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahera alla strängar\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (bara språken C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (bara språken C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 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:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (bara språken C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             hantera ANSI C treteckenssekvenser i infiler\n"
+msgstr ""
+"  -T, --trigraphs             hantera ANSI C treteckenssekvenser i infiler\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (bara språken C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=FIL               tillämpa ITS-regler från FIL\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (bara XML-baserade språk)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    känn igen Qt-formatsträngar\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (bara språket C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   känn igen KDE 4 formatsträngar\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 mer detaljerad igenkänning av formatsträngar\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 mer detaljerad igenkänning av formatsträngar\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               skriv ut itstool-kommentarer\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRÄNG  sätt copyrightinnehavare i resultatet\n"
+msgstr ""
+"      --copyright-holder=STRÄNG  sätt copyrightinnehavare i resultatet\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          utelämna FSF copyrighttext i resultatet\n"
+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:1205
+#: src/xgettext.c:1192
 #, 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:1207
+#: src/xgettext.c:1194
 #, 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:1209
-#, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EPOST@ADRESS   sätt mottagare för msgid-felrapporter\n"
-
-#: src/xgettext.c:1211
+#: src/xgettext.c:1196
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr "  -m[STRÄNG], --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG eller \"\"\n"
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EPOST@ADRESS   sätt mottagare för msgid-"
+"felrapporter\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
-msgstr "  -M[STRÄNG], --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med STRÄNG eller \"\"\n"
-
-#: src/xgettext.c:2040
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
-
-#: src/xgettext.c:2165
-msgid "standard input"
-msgstr "standard in"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Icke-ASCII-tecken vid %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Icke-ASCII-kommentar vid eller före %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Icke-ASCII-sträng vid %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: varning: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-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:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "%s är inte en giltig formatsträng för %s trots att den är deklarerad som en. Orsak: %s\n"
+msgstr ""
+"  -m[STRÄNG], --msgstr-prefix[=STRÄNG]  använd STRÄNG eller \"\" som prefix "
+"för msgstr\n"
 
-#: src/xgettext.c:2480
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
-"Formatsträngen \"%s\" med icke-namngivna argument kan inte översättas fullt ut:\n"
-"Översättaren kan inte byta ordning på argumenten.\n"
-"Ö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"
+"  -M[STRÄNG], --msgstr-suffix[=STRÄNG]  använd STRÄNG eller \"\" som suffix "
+"för msgstr\n"
 
-#: src/xgettext.c:2545
+#: src/xgettext.c:1597
+#, c-format
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Tom msgid.  Detta är reserverat av GNU gettext:\n"
-"gettext(\"\") returnerar huvudet med metainformation,\n"
-"inte den tomma strängen.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
+"Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
 
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
-
-#: src/xgettext.c:3334
-#, 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:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "kontext misstämmer mellan singular- och pluralformen"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "standard in"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3974,21 +4310,16 @@ msgstr ""
 "på variabeln MSGID_BUGS_ADDRESS där, annars ange\n"
 "flaggan --msgid-bugs-address på kommandoraden.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "språket \"%s\" okänt"
 
-#: 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-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Ange källkodning med --from-code\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3997,7 +4328,7 @@ msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4006,7 +4337,7 @@ msgstr ""
 "%s:%d: Lång ofullständig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4015,7 +4346,7 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid filslut.\n"
 "Ange korrekt källkodning med --from-code\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4024,7 +4355,7 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "Ange korrekt källkodning med --from-code\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4033,145 +4364,196 @@ msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: varning: RegExp-uttryck avslutas för tidigt"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: varning: %s tillåts inte"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: varning: oavslutad XML-tagg."
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, 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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: ogiltig sekvens (\"\\l\") för åttabitarstecknet \"%c\""
+msgstr "%s:%d: ogiltig sekvens (”\\l”) för 8-bitarstecknet ”%c”"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: ogiltig sekvens (\"\\u\") för åttabitarstecknet \"%c\""
+msgstr "%s:%d: ogiltig sekvens (”\\u”) för 8-bitarstecknet ”%c”"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ogiltig variabelinterpolation vid \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: ogiltig sekvens (\"\\L\") för åttabitarstecknet \"%c\""
+msgstr "%s:%d: ogiltig sekvens (”\\L”) för 8-bitarstecknet ”%c”"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, 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:278
+msgstr "%s:%d: ogiltig sekvens (”\\U”) för 8-bitarstecknet ”%c”"
+
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 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:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "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:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Lång ofullständig multibytesekvens.\n"
 "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
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid filslut.\n"
 "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:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "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:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "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:722
+#: src/x-python.c:654
 #, 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:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ogiltig strängdefinition"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d fattas tal efter #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ogiltigt strängmönster"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: ogiltig strängdefinition"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: ogiltig strängdefinition"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; använd eval_gettext istället"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; "
+"använd eval_gettext istället"
+
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: varning: reguljärt uttryck avslutas för tidigt"
@@ -4301,3 +4683,102 @@ msgstr "inuti en kommentar eller bearbetningsinstruktion"
 #, c-format
 msgid "document ended unexpectedly: %s"
 msgstr "dokumentet avslutades oväntat: %s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan \"--%s\" tar inget argument\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: okänd flagga \"--%s\"\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "varning: PO-filens huvudrader är luddiga\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Icke-ASCII-tecken vid %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Icke-ASCII-kommentar vid eller före %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Icke-ASCII-sträng vid %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: varning: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Trots att det används i en formatsträngsposition är inte %s en giltig %s-"
+#~ "formatsträng.  Orsak: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "%s är inte en giltig formatsträng för %s trots att den är deklarerad som "
+#~ "en. Orsak: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Formatsträngen \"%s\" med icke-namngivna argument kan inte översättas "
+#~ "fullt ut:\n"
+#~ "Översättaren kan inte byta ordning på argumenten.\n"
+#~ "Ö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"
+
+#~ 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 ""
+#~ "Tom msgid.  Detta är reserverat av GNU gettext:\n"
+#~ "gettext(\"\") returnerar huvudet med metainformation,\n"
+#~ "inte den tomma strängen.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "varning: kontext saknas för pluralargumentet till nyckelordet \"%.*s\""
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "kontext stämmer inte mellan singular- och pluralformen"
diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 1c7f4b29f..70cf7053a 100644
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,658 +6,1035 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2019-04-13 11:21+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"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argüman %s, %s için geçersiz"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argüman %s, %s için belirsiz"
 
-#: gnulib-lib/argmatch.c:155
-#, c-format
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:325
 #, 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:336
+#: gnulib-lib/clean-temp.c:339
 #, 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:432
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "geçici dosya %s silinemiyor"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "geçici dizin %s silinemiyor"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:175
+#, fuzzy, c-format
+#| msgid "error while opening \"%s\" for reading"
+msgid "error while opening %s for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:67
-#, c-format
-msgid "cannot open backup file \"%s\" for writing"
+#: gnulib-lib/copy-file.c:179
+#, fuzzy, c-format
+#| msgid "cannot open backup file \"%s\" for writing"
+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:75 src/urlget.c:210
-#, c-format
-msgid "error reading \"%s\""
+#: gnulib-lib/copy-file.c:183
+#, fuzzy, c-format
+#| msgid "error reading \"%s\""
+msgid "error reading %s"
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
-#, c-format
-msgid "error writing \"%s\""
+#: gnulib-lib/copy-file.c:187
+#, fuzzy, c-format
+#| msgid "error writing \"%s\""
+msgid "error writing %s"
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
-#, c-format
-msgid "error after reading \"%s\""
+#: gnulib-lib/copy-file.c:191
+#, fuzzy, c-format
+#| msgid "error after reading \"%s\""
+msgid "error after reading %s"
 msgstr "\"%s\" okunduktan sonra hata"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() başarısız"
 
-#: gnulib-lib/csharpcomp.c:539
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "C# derleyici bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/csharpexec.c:344
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s alt süreci başarısız"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' seçeneği bilinmiyor\n"
-
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
-
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:621
+#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' seçeneği belirsiz\n"
-
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
-
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class'ın source_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class'ın target_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin"
+msgstr ""
+"Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java sanal makinası bulunamadı,\n"
 "ya gij kurun ya da $JAVA değişkenini belirleyin"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
-msgid "cannot create pipe"
-msgstr "veriyolu oluşturulamıyor"
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s alt sürecine yazılamadı"
+
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "%s alt sürecinden okunamadı"
+
+#: gnulib-lib/pipe-filter-ii.c:419
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
+
+#: gnulib-lib/pipe-filter-ii.c:457
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "%s alt süreci ile haberleşilemedi"
+
+#: gnulib-lib/pipe-filter-ii.c:577
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/set-acl.c:46
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
+#, c-format
+msgid "cannot create pipe"
+msgstr "veriyolu oluşturulamıyor"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/w32spawn.h:90
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
+
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s alt süreci"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: src/format.c:149
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
-msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
+msgid "The root element must be <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr ""
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr ""
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, fuzzy, c-format
+#| msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
+msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
+
+#: src/cldr-plurals.c:192
+#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION] [FILE]...\n"
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "Kullanımı: %s [SEÇENEK] [DOSYA]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+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/cldr-plurals.c:211
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, 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/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, 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"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
+"Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, c-format, no-wrap
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, 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/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr ""
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr ""
+
+#: src/cldr-plurals.c:319
+#, fuzzy, c-format
+#| msgid "cannot remove temporary directory %s"
+msgid "cannot extract rules for %s"
+msgstr "geçici dizin %s silinemiyor"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr ""
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr ""
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "\"%s\" okunmak için açılırken hata"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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'"
+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:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
-#, 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:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u numaralı yönerge | ile başlıyor ama | ile bitmiyor."
 
-#: src/format-c.c:177
+#: src/format.c:152
+#, 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', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
+
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "%u numaralı yönergede, '<' işaretinden sonraki dizgecik biçem belirteci makronun ismi ile aynı değil. Geçerli makro isimleri ISO C 99 bölüm 7.8.1'de listelenmiştir."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"%u numaralı yönergede, '<' işaretinden sonraki dizgecik biçem belirteci "
+"makronun ismi ile aynı değil. Geçerli makro isimleri ISO C 99 bölüm 7.8.1'de "
+"listelenmiştir."
 
-#: src/format-c.c:565
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "%u numaralı yönergede, '<' işaretinden sonraki dizgecikten sonra '>' gelmiyor."
+msgstr ""
+"%u numaralı yönergede, '<' işaretinden sonraki dizgecikten sonra '>' "
+"gelmiyor."
 
-#: src/format-c.c:779
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 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."
+msgstr ""
+"Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, 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' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
+msgstr ""
+"%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
 
 #: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "%u numaralı yönergede, ',' ayracından sonra bir sayı gelmiyor."
 
-#: src/format-csharp.c:125 src/format-java.c:190
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Dizge yönergenin ortasında bitiyor: Eşleşmeyen '{' ve '}' ayraçları bulundu."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Dizge yönergenin ortasında bitiyor: Eşleşmeyen '{' ve '}' ayraçları bulundu."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "%u numaralı yönerge '}' ile değil, geçersiz '%c' karakteri ile bitiyor."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"%u numaralı yönerge '}' ile değil, geçersiz '%c' karakteri ile bitiyor."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "%u numaralı yönerge '}' ile değil, geçersiz bir karakterle bitiyor."
 
-#: src/format-csharp.c:152 src/format-java.c:333
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Dizge yönergenin ortasında başlıyor: eşleşmeyen '}' ve '{' ayraçları bulundu."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Dizge yönergenin ortasında başlıyor: eşleşmeyen '}' ve '{' ayraçları bulundu."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:159
 #, c-format
 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:245
+#: 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:276 src/format-gcc-internal.c:370
+#: 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:314
+#: 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."
+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:376
+#: src/format-gcc-internal.c:398
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+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: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:424
+#: 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:630
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+#| msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
 
-#: src/format-gcc-internal.c:633
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+#| msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
 
-#: src/format-invalid.h:23
+#: src/format-gfc-internal.c:383
+#, fuzzy, c-format
+#| msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
+
+#: src/format-gfc-internal.c:386
+#, fuzzy, c-format
+#| msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
+
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Dizge yönergenin ortasında bitiyor."
 
-#: src/format-invalid.h:26
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Dizge hem mutlak argüman numaralarına hem de numarasız argüman belirtimlerine karşılık geliyor."
+#: src/format-invalid.h:25
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Dizge hem mutlak argüman numaralarına hem de numarasız argüman "
+"belirtimlerine karşılık geliyor."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "%u numaralı yönergede, 0 numaralı argüman bir pozitif tamsayı değil."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "%u numaralı yönergede, width'in 0 numaralı argümanı bir pozitif tamsayı değil."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"%u numaralı yönergede, width'in 0 numaralı argümanı bir pozitif tamsayı "
+"değil."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "%u numaralı yönergede, precision'ın 0 numaralı argümanı bir pozitif tamsayı değil."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"%u numaralı yönergede, precision'ın 0 numaralı argümanı bir pozitif tamsayı "
+"değil."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "%u numaralı yönergede, '%c' karakteri geçerli bir dönüşüm belirteci değil."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"%u numaralı yönergede, '%c' karakteri geçerli bir dönüşüm belirteci değil."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "%u numaralı yönergeyi sonlandıran karakter geçerli bir dönüşüm belirteci değil."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"%u numaralı yönergeyi sonlandıran karakter geçerli bir dönüşüm belirteci "
+"değil."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Dizge, %u numaralı argümana uygun olmayan bir yolla karşılık geliyor."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "%u numaralı yönergede, \"%s\" altdizgesi geçerli bir tarih/zaman biçemi değil."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"%u numaralı yönergede, \"%s\" altdizgesi geçerli bir tarih/zaman biçemi "
+"değil."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "%u numaralı yönergede, \"%s\" den sonra virgül gelmiyor."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "%u numaralı yönergede, \"%s\" altdizgesi geçerli bir sayı biçemi değil."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr ""
+"%u numaralı yönergede, \"%s\" altdizgesi geçerli bir sayı biçemi değil."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "%u numaralı yönergede, argüman numarasından sonra bir virgül ve \"%s\" veya \"%s\" veya \"%s\" veya \"%s\" gelmeliydi."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"%u numaralı yönergede, argüman numarasından sonra bir virgül ve \"%s\" veya "
+"\"%s\" veya \"%s\" veya \"%s\" gelmeliydi."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "%u numaralı yönergede, bir seçim numara içermiyor."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "%u numaralı yönergede, bir seçim kendisinden sonra '<', '#' veya '%s' gelmeyen bir numara içeriyor."
-
-#: src/format-java.c:729
-#, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
-msgstr "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"%u numaralı yönergede, bir seçim kendisinden sonra '<', '#' veya '%s' "
+"gelmeyen bir numara içeriyor."
+
+#: src/format-java.c:745
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument {%u}, as in '%s', doesn't exist in "
+#| "'msgid'"
+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:739
+#: 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:759
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+#: src/format-java.c:776
+#, 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 "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
-#, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "%u numaralı yönergede, %u parametresi '%s' türünde, '%s' türünde bir parametre bekleniyordu."
+#: src/format-kde.c:158
+#, fuzzy, c-format
+#| msgid ""
+#| "The string refers to argument number %u but ignores argument number %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
+
+#: src/format-kde.c:242
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument %u, as in '%s', doesn't exist in "
+#| "'msgid'"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, fuzzy, c-format
+#| msgid "error while reading \"%s\""
+msgid "error while parsing: %s"
+msgstr "\"%s\" okunurken hata"
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
 #, c-format
-msgid "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."
-msgstr[0] "%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre umuluyordu."
-msgstr[1] "%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre umuluyordu."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"%u numaralı yönergede, %u parametresi '%s' türünde, '%s' türünde bir "
+"parametre bekleniyordu."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
+#, c-format
+msgid ""
+"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."
+msgstr[0] ""
+"%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre "
+"umuluyordu."
+msgstr[1] ""
+"%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre "
+"umuluyordu."
+
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "%u numaralı yönergede, %d. argüman negatif."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Dizge, bir ~/.../ yönergesinin ortasında bitiyor."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%2$c' ile eşleşmeyen '~%1$c' bulundu."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "%u numaralı yönergede, hem @ hem de : değiştiricileri verilmiş."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "%u numaralı yönergede, '~:[' yönergesinden sonra  '~;' ile ayrılmış iki cümle gelmiyor."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"%u numaralı yönergede, '~:[' yönergesinden sonra  '~;' ile ayrılmış iki "
+"cümle gelmiyor."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "%u numaralı yönergede, '~;' geçersiz bir konumda kullanılmış."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 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:3342 src/format-scheme.c:3280
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, 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' ve '%s' girdilerindeki biçem belirteçleri aynı değil"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
-
-#: src/format-perl.c:426
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "%u numaralı yönergede, boyut belirteci '%c' dönüşüm belirtimi ile uyumlu değil."
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, 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 ""
+"'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:113
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Dizge hem argüman isimlerine hem de numarasız argüman belirtimlerine karşılık geliyor."
-
-#: src/format-python.c:327
+#: src/format-perl.c:433
 #, 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ş."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"%u numaralı yönergede, boyut belirteci '%c' dönüşüm belirtimi ile uyumlu "
+"değil."
 
-#: src/format-python.c:403
-#, c-format
-msgid "format specifications in 'msgid' 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-brace.c:138
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
 
-#: src/format-python.c:410
-#, c-format
-msgid "format specifications in 'msgid' 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-brace.c:157
+#, fuzzy, c-format
+#| msgid ""
+#| "In the directive number %u, '{' is not followed by an argument number."
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
+
+#: src/format-python-brace.c:171
+#, fuzzy, c-format
+#| msgid "In the directive number %u, '%c' is not followed by a digit."
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
+
+#: src/format-python-brace.c:193
+#, fuzzy, c-format
+#| msgid "In the directive number %u, a precision is not allowed before '%c'."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
+
+#: src/format-python-brace.c:278
+#, fuzzy, c-format
+#| msgid "In the directive number %u, the argument %d is negative."
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "%u numaralı yönergede, %d. argüman negatif."
+
+#: src/format-python.c:115
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Dizge hem argüman isimlerine hem de numarasız argüman belirtimlerine "
+"karşılık geliyor."
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:354
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+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:430
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+#| "tuple"
+msgid ""
+"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:437
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+#| "mapping"
+msgid ""
+"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:460 src/format-sh.c:297
+#, fuzzy, c-format
+#| msgid ""
+#| "a format specification for argument '%s', as in '%s', doesn't exist in "
+#| "'msgid'"
+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:463
-#, c-format
-msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#: src/format-python.c:494
+#, fuzzy, c-format
+#| msgid ""
+#| "format specifications in 'msgid' and '%s' for argument '%s' are not the "
+#| "same"
+msgid ""
+"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:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "%%%c için çoklu başvuru."
+msgid ""
+"'%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:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Dizge, ASCII olmayan karakter içeren bir kabuk değişkeni."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Dizge, kabuğun kaşlı ayraç sözdizimli bir kabuk değişkenine karşılık. Güvenlikle ilgili sebeplerden dolayı bu sözdizimi desteklenmiyor."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Dizge, kabuğun kaşlı ayraç sözdizimli bir kabuk değişkenine karşılık. "
+"Güvenlikle ilgili sebeplerden dolayı bu sözdizimi desteklenmiyor."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Dizge, değeri kabuk işlevleri içinde farklı olabilen bir kabuk değişkenine ait."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Dizge, değeri kabuk işlevleri içinde farklı olabilen bir kabuk değişkenine "
+"ait."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Dizge, isimsiz bir kabuk değişkenini gösteriyor."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "%u numaralı yönergede, '%c' karakteri 1 ile 9 arasında bir rakam değil."
-
-#: src/format-ycp.c:84
-#, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
-
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
-#, c-format, no-wrap
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr ""
-"Telif Hakkı (C) %s Free Software Foundation, Inc.\n"
-"Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n"
-"Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
-"UYGUNLUĞU için bile garanti verilmez.\n"
+"%u numaralı yönergede, '%c' karakteri 1 ile 9 arasında bir rakam değil."
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/format-ycp.c:91
 #, c-format
-msgid "Written by %s.\n"
-msgstr "%s tarafından yazıldı.\n"
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr ""
+"%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
-#, 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:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
@@ -680,7 +1057,8 @@ msgstr "  -s, --short                 kısa konak ismi\n"
 #: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          uzun konak ismi; alan ismini ve rümuzları da\n"
@@ -691,71 +1069,103 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
-#, 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:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "makina ismi alınamadı"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
-#, 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"
+#: src/its.c:319
+#, fuzzy, c-format
+#| msgid "at least two files must be specified"
+msgid "selector is not specified"
+msgstr "en az iki dosya belirtilmelidir"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+#: src/its.c:326 src/its.c:1635
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot create XPath context"
+msgstr "veriyolu oluşturulamıyor"
+
+#: src/its.c:344
+#, c-format
+msgid "cannot evaluate XPath expression: %s"
 msgstr ""
-"Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
-"Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/its.c:695
 #, c-format
-msgid "could not get host name"
-msgstr "makina ismi alınamadı"
+msgid "\"%s\" node does not contain \"%s\""
+msgstr ""
+
+#: src/its.c:1086
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "argüman %s, %s için geçersiz"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr ""
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, fuzzy, c-format
+#| msgid "cannot create pipe"
+msgid "cannot read %s: %s"
+msgstr "veriyolu oluşturulamıyor"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr ""
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/locating-rule.c:307
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot read XML file %s"
+msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr ""
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -764,255 +1174,333 @@ msgstr ""
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, 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"
+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:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=DİZİN       girdi dosyasının arandığı listeye DİZİNi ekler\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=DİZİN       girdi dosyasının arandığı listeye DİZİNi "
+"ekler\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
+msgstr ""
+"Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            çevrilmiş iletileri tutar çevrilmemişleri siler\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            çevrilmiş iletileri tutar çevrilmemişleri "
+"siler\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          çevrilmemiş iletileri tutar çevrilmişleri siler\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          çevrilmemiş iletileri tutar çevrilmişleri "
+"siler\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' imli iletileri tutar\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           kullanımdışı olan #~ iletilerini siler\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         kullanımdışı olan #~ iletilerini tutar\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Nitelik değiştirme:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             tüm iletileri 'fuzzy' olarak imler\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:469
 #, 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:446
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          tüm iletileri kullanımdışı yapar\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma sokar\n"
+msgstr ""
+"      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma "
+"sokar\n"
+
+#: src/msgattrib.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "      --previous              keep previous msgids of translated "
+#| "messages\n"
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        tüm iletilerden eski msgid'ler kaldırılır\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        tüm iletilerden eski msgid'ler kaldırılır\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+#| msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
+
+#: src/msgattrib.c:482
 #, 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"
+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:454
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=DOSYA.po  sadece DOSYA.po içinde bulunmayan girdileri\n"
 "                              değiştirir\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
+msgstr ""
+"      --fuzzy                 --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      girdi dosyası Java .properties sözdizimindedir\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      girdi dosyası Java .properties "
+"sözdizimindedir\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi dosyası\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi "
+"dosyası\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
+#, 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:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz (öntanımlı)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz "
+"(öntanımlı)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                çıktıda C öncelemeleri kullanılır, karakterler\n"
+"  -E, --escape                çıktıda C öncelemeleri kullanılır, "
+"karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, 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:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, 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:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           '#: dosyaismi:satır' satırları yazılmaz\n"
+msgstr ""
+"      --no-location           '#: dosyaismi:satır' satırları yazılmaz\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: dosyaismi:satır' satırları üretilir\n"
 "                              (öntanımlı\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                .po dosyasının bilinen biçeminde yazar.\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                .po dosyasının bilinen biçeminde yazar.\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, 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"
+msgstr ""
+"  -p, --properties-output     çıktıyı bir Java .properties dosyasına yazar\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    çıktıyı bir NeXTstep/GNUstep .strings\n"
 "                              dosyasına yazar\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, 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:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1021,32 +1509,42 @@ 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:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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:296 src/msgcomm.c:315
+#: 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:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
 
-#: src/msgcat.c:342
-#, c-format, no-wrap
+#: src/msgcat.c:371
+#, fuzzy, c-format, no-wrap
+#| msgid ""
+#| "Concatenates and merges the specified PO files.\n"
+#| "Find messages which are common to two or more of the specified PO files.\n"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be cumulated, except that if --use-first\n"
+#| "is specified, they will be taken from the first PO file to define them.\n"
+#| "File positions from all PO files will be cumulated.\n"
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1054,9 +1552,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be cumulated, except that if --use-first\n"
-"is specified, they will be taken from the first PO file to define them.\n"
-"File positions from all PO files will be cumulated.\n"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"
 msgstr ""
 "Belirtilen PO dosyalarını birleştirir ve katıştırır.\n"
 "Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri\n"
@@ -1069,23 +1567,24 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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"
+msgstr ""
+"  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1094,7 +1593,7 @@ msgstr ""
 "  -<, --less-than=SAYI        bu SAYIdan daha fazla olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı sonsuzdur.\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1103,7 +1602,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      bu SAYIdan daha az olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı 0 dır.\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1112,14 +1611,17 @@ msgstr ""
 "  -u, --unique                --less-than=2 için kısaltmadır, sadece\n"
 "                              eşi olmayan iletiler basılır\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      girdi dosyaları Java .properties sözdizimlidir\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      girdi dosyaları Java .properties "
+"sözdizimlidir\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1128,12 +1630,12 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi\n"
 "                              dosyaları\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, 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:400 src/msguniq.c:368
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1142,27 +1644,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:432 src/msgen.c:345 src/msgmerge.c:628
+#, c-format
+msgid ""
+"      --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:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "hiçbir girdi dosyası verilmemiş"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tam olarak 2 girdi dosyası gerekli"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, 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:208
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1178,87 +1686,105 @@ 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:222
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      çeviriler\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     kaynaklara bağlantılar\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "İşlem değiştiriciler:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          ref.pot'u tüm def.po dosyalarına uygular\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          ref.pot'u tüm def.po dosyalarına uygular\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:242 src/msgmerge.c:613
+#, 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:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             çıktıda fuzzy girdiler kullanılır\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      çıktıda çevrilmemiş girdiler kullanılır\n"
+msgstr ""
+"      --use-untranslated      çıktıda çevrilmemiş girdiler kullanılır\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "bu ileti çevrilmemiş"
 
-#: src/msgcmp.c:312
+#: 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:328 src/msgmerge.c:1214
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "bu ileti kullanıldı ama tanımlı değil..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ama bu tanımlama benzer"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, 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:440
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, 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:304
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "en az iki dosya belirtilmelidir"
 
-#: src/msgcomm.c:352
-#, c-format, no-wrap
+#: 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"
+#| "By using the --more-than option, greater commonality may be requested\n"
+#| "before messages are printed.  Conversely, the --less-than option may be\n"
+#| "used to specify less commonality before messages are printed (i.e.\n"
+#| "--less-than=2 will only print the unique messages).  Translations,\n"
+#| "comments and extract comments will be preserved, but only from the first\n"
+#| "PO file to define them.  File positions from all PO files will be\n"
+#| "cumulated.\n"
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
@@ -1272,7 +1798,7 @@ msgstr ""
 "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
 "korunmuş olacaktır.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1281,67 +1807,76 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
-#, c-format
-msgid "      --omit-header           don't write header with `msgid \"\"' entry\n"
-msgstr "      --omit-header           başlıktaki `msgid \"\"' girdisini yazmaz\n"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, fuzzy, c-format
+#| msgid ""
+#| "      --omit-header           don't write header with `msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           başlıktaki `msgid \"\"' girdisini yazmaz\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:311
 #, 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:319
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Dönüşüm hedefi:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:339
 #, 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:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
-#: src/msgmerge.c:546
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
-
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
-#: src/msgmerge.c:548
-#, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
+
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
+#, fuzzy, c-format
+#| msgid ""
+#| "      --add-location          preserve '#: filename:line' lines "
+#| "(default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          '#: dosyaismi:satır' satırları korunur\n"
 "                              (öntanımlı)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
-#: src/msgmerge.c:550
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
 
-#: src/msgen.c:234
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "tam olarak 1 girdi dosyası gerekli"
 
-#: src/msgen.c:275
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] GİRDİDOSYASI\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1354,22 +1889,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:292
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  GİRDİDOSYASI                PO ya da POT dosyası\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "komut ismi eksik"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK] KOMUT [KOMUT-SEÇENEĞİ]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1384,7 +1919,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:255
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1393,42 +1928,49 @@ 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:265 src/msgfilter.c:413
+#: src/msgexec.c:281
+#, fuzzy, c-format
+#| msgid "standard input"
+msgid "Command input:\n"
+msgstr "standart girdi"
+
+#: src/msgexec.c:283
+#, fuzzy, c-format
+#| msgid "  -h, --help                  display this help and exit\n"
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
+
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    PO dosyası\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "standart çıktıya yazılamadı"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s alt sürecine yazılamadı"
-
-#: src/msgfilter.c:301
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "süzgeç ismi eksik"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "en az bir sed betiği belirtilmelidir"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:413
 #, 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:404
+#: src/msgfilter.c:417
 #, 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:428
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1437,294 +1979,427 @@ 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:433
+#: src/msgfilter.c:446
+#, c-format
+msgid "Filter input and output:\n"
+msgstr ""
+
+#: src/msgfilter.c:448
+#, c-format
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
+msgstr ""
+
+#: src/msgfilter.c:452
 #, 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:435
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+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:437
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=BETİK            BETİK dosyasının içeriğini çalıştırılacak\n"
 "                              komutlara ekler\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:459
 #, 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"
+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:452 src/msggrep.c:578
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             çıktıda C öncelemeleri kullanılmaz (öntanımlı)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             çıktıda C öncelemeleri kullanılmaz "
+"(öntanımlı)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+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:588
-#, c-format
-msgid "Not yet implemented."
-msgstr "Henüz çalışmıyor."
-
-#: src/msgfilter.c:617
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
-
-#: src/msgfilter.c:645
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s alt süreci ile haberleşilemedi"
-
-#: src/msgfilter.c:696
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s alt sürecinden okunamadı"
-
-#: src/msgfilter.c:712
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
+#: src/msgfilter.c:665
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "filter output is not terminated with a newline"
+msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:372
 #, 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:352
+#: src/msgfmt.c:419
 #, 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:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:471
+#, fuzzy, c-format
+#| msgid "If no input file is given or if it is -, standard input is read.\n"
+msgid "no input file should be given if %s and %s are specified"
+msgstr "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
+
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 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:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: 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:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, fuzzy, c-format
+#| msgid "%s requires a \"-l locale\" specification"
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, fuzzy, c-format
+#| msgid "%s and %s are mutually exclusive"
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s ile %s bağdaşmıyor"
+
+#: src/msgfmt.c:626 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:484 src/msgfmt.c:490
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, 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:601
+#: src/msgfmt.c:711
+#, fuzzy, c-format
+#| msgid "cannot create output file \"%s\""
+msgid "cannot locate ITS rules for %s"
+msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:872
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d çevrilmiş ileti"
 msgstr[1] "%d çevrilmiş ileti"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d belirsiz çeviri"
 msgstr[1] ", %d belirsiz çeviri"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d çevrilmemiş ileti"
 msgstr[1] ", %d çevrilmemiş ileti"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:910
 #, 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:640 src/xgettext.c:751
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-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:647
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java kipi: bir Java ResourceBundle sınıfı üretir\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java kipi: bir Java ResourceBundle sınıfı "
+"üretir\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
-"      --java2                 --java gibi, Java2' de (JDK 1.2 ve daha yüksek)\n"
+"      --java2                 --java gibi, Java2' de (JDK 1.2 ve daha "
+"yüksek)\n"
 "                              kabul edilir\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# kipi: bir .NET .dll dosyası üretilir\n"
+msgstr ""
+"      --csharp                C# kipi: bir .NET .dll dosyası üretilir\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      C# özkaynak kipi: bir .NET .resources dosyası\n"
 "                              üretilir\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   Tcl kipi:bir tcl/msgcat .msg dosyası üretilir\n"
+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:666
+#: src/msgfmt.c:941
 #, 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:673
+#: src/msgfmt.c:943
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
+
+#: src/msgfmt.c:945
+#, fuzzy, c-format
+#| msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, 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:678
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:959 src/msgfmt.c:975 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:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+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:684
+#: src/msgfmt.c:963
+#, fuzzy, c-format
+#| msgid ""
+#| "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --tcl               Tcl kipi: girdi bir tcl/msgcat .msg dosyasıdır\n"
+
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d DİZİN                    sınıf ana dizini\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 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:692
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d DİZİN                    yerele bağımlı .dll dosyaları için kök dizin\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d DİZİN                    yerele bağımlı .dll dosyaları için kök dizin\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:981
 #, 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 ""
-"-l ve -d seçenekleri zorunludur. .dll dosyası yerelin ismine göre belirlenen\n"
+"-l ve -d seçenekleri zorunludur. .dll dosyası yerelin ismine göre "
+"belirlenen\n"
 "dizinin bir altdizinine yazılır.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl kipte çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:989 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:710
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
+msgstr ""
+"-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, fuzzy, c-format
+#| msgid ""
+#| "  -d DIRECTORY                base directory of .msg message catalogs\n"
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr "  -d DİZİN                   .msg ileti kataloglarının ana dizini\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, fuzzy, c-format
+#| msgid ""
+#| "  -k, --keyword[=WORD]        additional keyword to be looked for "
+#| "(without\n"
+#| "                              WORD means not to use default keywords)\n"
+msgid ""
+"  -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/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr ""
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 --check-format, --check-header, --check-domain\n"
+"  -c, --check                 --check-format, --check-header, --check-"
+"domain\n"
 "                              için kısaltma\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          dile bağlı biçem dizgeleri kontrol edilir\n"
+msgstr ""
+"      --check-format          dile bağlı biçem dizgeleri kontrol edilir\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr ""
 "      --check-header          başlık girdilerilerinin varlığı ve içeriği\n"
 "                              kontrol edilir\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1733,112 +2408,138 @@ msgstr ""
 "      --check-domain          --output-file seçeneği ile paket yönergeleri\n"
 "                              arasındaki çelişkiler kontrol edilir\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=KRKT]  menü öğeleri için tuş belirticiler\n"
 "                                   kontrol edilir\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:1053
 #, 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:744
+#: src/msgfmt.c:1058
 #, 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"
+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:746
+#: src/msgfmt.c:1060
 #, 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"
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:1063
+#, 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:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            çeviriler hakkındaki istatistikleri basar\n"
+msgstr ""
+"      --statistics            çeviriler hakkındaki istatistikleri basar\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:1074 src/msgmerge.c:670 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:867
+#: src/msgfmt.c:1185
 #, 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:870
+#: src/msgfmt.c:1187
 #, 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:880
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "uyarı: PO dosya başlığı fuzzy\n"
-
-#: src/msgfmt.c:882
-#, 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:906
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1216
 #, 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:925
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:1230
+#, fuzzy, c-format
+#| msgid "`domain %s' directive ignored"
+msgid "'domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:985
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1290
+#, fuzzy, c-format
+#| msgid "empty `msgstr' entry ignored"
+msgid "empty 'msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:986
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1291
+#, fuzzy, c-format
+#| msgid "fuzzy `msgstr' entry ignored"
+msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 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
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "'%c' seçeneği 'J', 'K', 'T', 'C' veya 'X' harflerinden biri belirtilmeden önce kullanılamaz"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"'%c' seçeneği 'J', 'K', 'T', 'C' veya 'X' harflerinden biri belirtilmeden "
+"önce kullanılamaz"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1847,7 +2548,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:531
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1925,34 +2626,42 @@ msgstr ""
 "  -v, --invert-match        sadece bir seçim kriteri ile eşleşmeyen iletiler\n"
 "                            çıktılanır\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                çıktıda C öncelemeleri kullanılır, karakterler\n"
+"      --escape                çıktıda C öncelemeleri kullanılır, "
+"karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sıralı çıktı üretir\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:625
 #, 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:288
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Siz dil farkları bulunmayan bir ülkedesiniz. Lütfen LANG sistem\n"
 "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n"
 "Bu çevirinizi test edebilmeniz için gereklidir.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1963,38 +2672,39 @@ 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:338
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s oluşturuldu.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:371
 #, 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:368
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    POT dosyası\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n"
 "- verilmişse standart girdi okunur.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:389
 #, 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:378
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2003,48 +2713,55 @@ 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:391
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:406
 #, 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"
+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:449
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Birden fazla .pot dosyası bulundu.\n"
-"Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile belirtin.\n"
+"Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
+"belirtin.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "dizin okunurken hata"
 
-#: src/msginit.c:470
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "Bulunduğunuz dizinde .pot dosyası yok.\n"
-"Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile belirtin.\n"
+"Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
+"belirtin.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, 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:1051
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Kullanıcıların çevirileriniz hakkında geribesleme sağlayabilmesi ve\n"
@@ -2054,41 +2771,50 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:178 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:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, 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:205
-#, c-format
-msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:203
+#, fuzzy, c-format
+#| msgid ""
+#| "input file `%s' doesn't contain a header entry with a charset "
+#| "specification"
+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:209
-#, c-format
-msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
+#: 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"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
 msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
 "kümesi belirtilmemiş"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, 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:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
@@ -2105,7 +2831,8 @@ msgstr ""
 #: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2124,9 +2851,10 @@ msgstr ""
 "%s dosyasının %s kodlamasından %s kodlamasına dönüşümü\n"
 "bazı msgid veya msgctxt'leri değiştiriyor.\n"
 "Ya bütün msgid ve msgctxt'leri saf ASCII yapın ya da kaynak kod\n"
-"dosyalarınızdaki gibi başından itibaren UTF-8 kodlanmış olmalarını sağlayın.\n"
+"dosyalarınızdaki gibi başından itibaren UTF-8 kodlanmış olmalarını "
+"sağlayın.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2139,12 +2867,12 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Yapılabilecekler:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:99
 #, 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:107
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2155,7 +2883,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2168,7 +2896,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2179,135 +2907,165 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:145
 #, 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:143
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgl-check.c:153
-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:201
+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:185
+#: src/msgl-check.c:270
 #, 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:268 src/msgl-check.c:292
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:478
 #, 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:400
+#: src/msgl-check.c:494
 #, 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:420
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 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:502
-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:616
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+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:510
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:623
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+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:525
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:639
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+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:543
-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:657
+#, fuzzy
+#| msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+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:551
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:664
+#, fuzzy, c-format
+#| msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+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:566
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:680
+#, fuzzy
+#| msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+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:578
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:670
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:818
+#, fuzzy, c-format
+#| msgid "some header fields still have the initial default value\n"
+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-check.c:835
+#, fuzzy, c-format
+#| msgid "headerfield `%s' missing in header\n"
+msgid "header field '%s' missing in header\n"
 msgstr "başlıkta `%s' başlık alanı yok\n"
 
-#: src/msgl-check.c:678
-#, 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:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:692
-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:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr ""
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr ""
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr ""
+
+#: src/msgl-check.c:1162
 #, 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"
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2319,41 +3077,49 @@ msgstr "%s: girdi \"%s\" kodlama için geçersiz"
 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:262
+#: src/msgl-iconv.c:288
 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:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 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:314
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr " \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı oluyor."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+" \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı "
+"oluyor."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
 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:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sadece %s ile geçerlidir"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2376,17 +3142,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:562
 #, 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:564
 #, 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:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2395,7 +3161,7 @@ msgstr ""
 "  -C, --compendium=DOSYA      ileti çevirileri için ek veritabanı, birden\n"
 "                              fazla belirtilebilir\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2404,30 +3170,31 @@ 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:586
 #, 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:588
 #, 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:590
 #, 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:592
 #, 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:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2442,142 +3209,169 @@ msgstr ""
 "                              yedekleme yapılır\n"
 "  simple, never               daima basit yedekleme yapılır\n"
 
-#: src/msgmerge.c:514
-#, c-format
+#: src/msgmerge.c:601
+#, fuzzy, c-format
+#| msgid ""
+#| "The backup suffix is `~', unless set with --suffix or the "
+#| "SIMPLE_BACKUP_SUFFIX\n"
+#| "environment variable.\n"
 msgid ""
-"The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 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:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
+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:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       işlemin ilerleyişi gösterilmez\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr ".bu ileti çoğul biçem olmalıydı"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık kullanılmayan ileti okundu.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
+"kullanılmayan ileti okundu.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
+#, c-format
 msgid " done.\n"
 msgstr " bitti.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: 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:416
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [DOSYA]...\n"
 
-#: src/msgunfmt.c:420
+#: 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:429
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java              Java kipi: girdi bir  Java ÖzkaynakPaketi sınıfıdır\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java              Java kipi: girdi bir  Java ÖzkaynakPaketi "
+"sınıfıdır\n"
 
-#: src/msgunfmt.c:431
+#: 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"
+msgstr ""
+"      --csharp                C# kipi: girdi bir .NET .dll dosyasıdır\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      C# özkaynak kipi: girdi bir .NET .resources\n"
 "                              dosyasıdır\n"
 
-#: src/msgunfmt.c:435
+#: 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"
+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:440
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DOSYA ...                   girdi .mo dosyaları\n"
 
-#: src/msgunfmt.c:445
+#: 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:451
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 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:456
+#: 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:464
+#: 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 ""
-"-l ve -d seçenekleri zorunludur. .dll dosyası yerelin ismine göre belirlenen\n"
+"-l ve -d seçenekleri zorunludur. .dll dosyası yerelin ismine göre "
+"belirlenen\n"
 "dizinin bir altdizininde bulunur.\n"
 
-#: src/msgunfmt.c:468
+#: 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:474
+#: 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 ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
+msgstr ""
+"-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgunfmt.c:494
+#: 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:496
+#: 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:319
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2598,24 +3392,26 @@ 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:352
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              sadece yinelenenler yazılır\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr ""
 "  -u, --unique                sadece tek iletiler gösterilir,\n"
 "                              tekrarlananlar iptal edilir\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdÇ>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2672,18 +3468,21 @@ msgid "inconsistent use of #~"
 msgstr "#~ kullanımı aykırı"
 
 #: src/po-gram-gen.y:241
-#, c-format
-msgid "missing `msgstr[]' section"
+#, fuzzy, c-format
+#| msgid "missing `msgstr[]' section"
+msgid "missing 'msgstr[]' section"
 msgstr "`msgstr[]' bölümü yok"
 
 #: src/po-gram-gen.y:250
-#, c-format
-msgid "missing `msgid_plural' section"
+#, fuzzy, c-format
+#| msgid "missing `msgid_plural' section"
+msgid "missing 'msgid_plural' section"
 msgstr "`msgid_plural' bölümü yok"
 
 #: src/po-gram-gen.y:258
-#, c-format
-msgid "missing `msgstr' section"
+#, fuzzy, c-format
+#| msgid "missing `msgstr' section"
+msgid "missing 'msgstr' section"
 msgstr "`msgstr' bölümü yok"
 
 #: src/po-gram-gen.y:397
@@ -2696,113 +3495,151 @@ 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:93 src/po-lex.c:112
+#: 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:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
 
-#: src/po-lex.c:468
+#: 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:478
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv başarısızlığı"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "anahtar-sözcük \"%s\" bilinmiyor"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "denetim dizisi geçersiz"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "dizge içinde dosya sonu"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "dizge içinde satır sonu"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
 msgstr "bu ilk tanımlamanın konumu"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr ""
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr ""
+
+#: src/read-desktop.c:405
+#, fuzzy, c-format
+#| msgid "missing filter name"
+msgid "missing '=' after \"%s\""
+msgstr "süzgeç ismi eksik"
+
+#: src/read-desktop.c:468
+#, fuzzy
+#| msgid "invalid nplurals value"
+msgid "invalid non-blank line"
+msgstr "nplurals değeri geçersiz"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" dosyası kırpılmış"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor"
+msgstr ""
+"\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "uyarı: Unicode karakter için \\uxxxx sözdizimi geçersiz"
 
-#: src/read-stringtable.c:804
+#: src/read-properties.c:429
+#, c-format
+msgid "warning: lone surrogate U+%04X"
+msgstr ""
+
+#: src/read-properties.c:499 src/read-properties.c:534
+#, fuzzy
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "uyarı: sonlandırılmamış dizge"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "uyarı: sözdizimi hatası"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "uyarı: sonlandırılmamış isim/değer çifti"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' yok"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' ya da '=' umuluyor"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s ve %s tarafından yazıldı.\n"
@@ -2811,16 +3648,16 @@ msgstr "%s ve %s tarafından yazıldı.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Sırpça metni Kril alfabesinden Latin alfabesine yeniden kodlar.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -2829,27 +3666,27 @@ msgstr ""
 "Girdi metni standart girdiden okunur.  Dönüştürülmüş metin\n"
 "standart çıktıya çıktılanır.\n"
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "girdi \"%s\" kodlama için geçersiz"
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
 
-#: src/urlget.c:147
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "iki argüman gerekiyor"
 
-#: src/urlget.c:164
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] URL DOSYA\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2858,92 +3695,143 @@ 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:216
+#: src/urlget.c:227
+#, c-format
+msgid "error reading \"%s\""
+msgstr "\"%s\" okunurken hata"
+
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "standart çıktıya yazılırken hata"
 
-#: src/write-catalog.c:102
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya yazılamaz. PO dosyası sözdizimini kullanmayı deneyin."
+#: src/urlget.c:237
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "\"%s\" okunduktan sonra hata"
+
+#: src/urlget.c:263
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:296
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:433
+#, c-format
+msgid " failed.\n"
+msgstr ""
 
-#: src/write-catalog.c:105
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya yazılamaz."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya "
+"yazılamaz. PO dosyası sözdizimini kullanmayı deneyin."
 
-#: src/write-catalog.c:138
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya yazılamaz."
+
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "çıktı biçimi onları desteklemiyor."
 
-#: src/write-catalog.c:173
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "ileti kataloğu çoğul biçemli çeviriler içeriyor ama çıktı biçemi bunları desteklemiyor. Bir Java sınıfını .properties dosyası yerine \"msgfmt --java\" kullanarak üretmeyi deneyin."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"ileti kataloğu çoğul biçemli çeviriler içeriyor ama çıktı biçemi bunları "
+"desteklemiyor. Bir Java sınıfını .properties dosyası yerine \"msgfmt --java"
+"\" kullanarak üretmeyi deneyin."
 
-#: src/write-catalog.c:178
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "ileti kataloğu çoğul çeviriler içermesine rağmen çıktı biçimi çoğul çevirileri desteklemiyor."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"ileti kataloğu çoğul çeviriler içermesine rağmen çıktı biçimi çoğul "
+"çevirileri desteklemiyor."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
-"C# .dll biçimi bağlamları desteklemiyor\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" dizini oluşturulamadı"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:771
 #, 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-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
-"Java ResourceBundle biçimi bağlamları desteklemiyor\n"
+#: src/write-csharp.c:773
+#, fuzzy, c-format
+#| msgid "compilation of C# class failed, please try --verbose"
+msgid "compilation of C# class failed"
+msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-java.c:945
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "\"%s\" yazılmak için açılırken hata"
+
+#: src/write-java.c:1096
 #, 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:1029
+#: src/write-java.c:1216
 #, 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-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "\"%s\" yazılmak için açılırken hata"
+#: src/write-java.c:1219
+#, fuzzy, c-format
+#| msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
+msgid "compilation of Java class failed, please try to 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-po.c:567
-#, c-format
-msgid "internationalized messages should not contain the `\\%c' escape sequence"
+#: src/write-po.c:821
+#, fuzzy
+#| msgid "invalid multibyte sequence"
+msgid "incomplete multibyte sequence"
+msgstr "çoklu bayt dizisi geçersiz"
+
+#: src/write-po.c:884
+#, fuzzy, c-format
+#| msgid ""
+#| "internationalized messages should not contain the `\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2956,7 +3844,7 @@ msgstr ""
 "olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2969,7 +3857,7 @@ msgstr ""
 "olabilir. Salt ASCII msgid kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -2977,23 +3865,26 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen Qt ileti kataloğu\n"
 "biçimi çoğul çevirileri desteklemiyor\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:694
 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 ""
-"Qt iletiği kataloğu biçimi Unicode karakterlerin sadece çevrilmiş dizgelerde\n"
+"Qt iletiği kataloğu biçimi Unicode karakterlerin sadece çevrilmiş "
+"dizgelerde\n"
 "kullanılmasına izin verir, halbuki ileti kataloğunun msgctxt iletileri\n"
 "ISO-8859-1 kodlamasının dışında karakterler içeriyor.\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
 msgstr ""
-"Qt iletiği kataloğu biçimi Unicode karakterlerin sadece çevrilmiş dizgelerde\n"
+"Qt iletiği kataloğu biçimi Unicode karakterlerin sadece çevrilmiş "
+"dizgelerde\n"
 "kullanılmasına izin verir, halbuki ileti kataloğunun msgid iletileri\n"
 "ISO-8859-1 kodlamasının dışında karakterler içeriyor.\n"
 
@@ -3002,7 +3893,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "%s alt süreçine yazarken hata"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3010,7 +3901,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:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3018,7 +3909,7 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen C# .resources\n"
 "biçimi çoğul çevirileri desteklemiyor\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3026,7 +3917,7 @@ msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "Tcl ileti kataloğu biçemi bağlamları desteklemiyor\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3034,36 +3925,62 @@ 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:341 src/x-python.c:1059
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:225
+#, fuzzy
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+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:263
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3072,7 +3989,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:279
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3081,7 +3998,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:291
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3090,7 +4007,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:300
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3099,12 +4016,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:309 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3113,238 +4030,135 @@ 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:1382 src/x-python.c:1259
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
-
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabit"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:429 src/x-glade.c:436
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu: %s"
-
-#: src/x-glade.c:463
+#: src/xgettext.c:567
 #, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
-"\"glade\" dili desteklenmiyor. %s expat'a bağlı.\n"
-"Bu sürüm expat olmaksızın kurgulanmış.\n"
-
-#: src/x-perl.c:307
-#, 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:1033
-#, 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:1153
-#, 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:1173
-#, 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:1207
-#, 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:1220
-#, 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:1237
-#, 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/xgettext.c:637
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "syntax check '%s' unknown"
+msgstr "dil `%s' bilinmiyor"
 
-#: src/x-python.c:234
+#: src/xgettext.c:646
 #, c-format
-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"
+msgid "sentence end type '%s' unknown"
 msgstr ""
-"%s%s içinde ASCII olmayan dizge.\n"
-"Lütfen, kaynak kodlamasını --from-code seçeneği ile ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:282
+#: src/xgettext.c:701
 #, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d: Çokbaytlı dizilim geçersiz.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
-
-#: src/x-python.c:299
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d: Çokbaytlı dizilim eksik kalmış.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr "standart çıktıya yazılırken --join-existing kullanılamaz"
 
-#: src/x-python.c:312
+#: src/xgettext.c:705
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d: Dosyanın sonunda çokbaytlı dizilim eksik kalmış.\n"
-"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
+msgid "xgettext cannot work without keywords to look for"
+msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/x-python.c:322
+#: src/xgettext.c:839
 #, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid "warning: ITS rule file '%s' does not exist"
 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 ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:355
+#: src/xgettext.c:920
 #, c-format
 msgid ""
-"%s:%d: Invalid multibyte sequence.\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"
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
-"%s:%d: Çokbaytlı dizilim geçersiz.\n"
-"Lütfen, kaynak kodlamasını --from-code seçeneği ile ya da\n"
-"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
-"bir açıklama ile belirtiniz.\n"
-
-#: src/x-python.c:675
-#, 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:107
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: dizge ataması geçersiz"
-
-#: src/x-rst.c:171
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d:  # dan sonra sayı yok"
-
-#: src/x-rst.c:206
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: dizge ifade geçersiz"
 
-#: src/x-sh.c:1074
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık kullanılmayacak; yerine eval_gettext kullanın"
-
-#: src/xgettext.c:547
-#, 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:552
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
-
-#: src/xgettext.c:695
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#: src/xgettext.c:938
+#, fuzzy, c-format
+#| msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
+msgstr ""
+"  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:1052
 #, 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:773
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+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:778
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:780
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=İSİM         belirtilen dil tanınır:\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+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:793
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3353,230 +4167,846 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:1078
 #, 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"
+msgstr ""
+"Öntanımlı olarak, girdi dosyalarının yerel kodlaması ASCII kabul edilir.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:1083
 #, 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:803
+#: src/xgettext.c:1085
 #, 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"
+msgstr ""
+"  -x, --exclude-file=DOSYA.po girdiler DOSYA.po dosyasından elde edilir\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:1087
+#, fuzzy, c-format
+#| msgid ""
+#| "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+#| "                              preceding keyword lines) in output file\n"
+msgid ""
+"  -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:1092
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
-msgstr "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:817
-#, c-format
+#: src/xgettext.c:1113
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, Tcl, Perl, PHP, GCC-source, "
+#| "Glade)\n"
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\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"
+"                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 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:827
-#, c-format
+#: src/xgettext.c:1121
+#, fuzzy, c-format
+#| msgid ""
+#| "                                (only languages C, C++, ObjectiveC, "
+#| "Shell,\n"
+#| "                                Python, Lisp, EmacsLisp, librep, Scheme, "
+#| "Java,\n"
+#| "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-"
+#| "source)\n"
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
-"                               (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                               (sadece bu diller: C, C++, ObjectiveC, "
+"Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:1126
 #, 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:833
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (sadece bu diller: C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (sadece bu diller: C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, fuzzy, c-format
+#| msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
+
+#: src/xgettext.c:1132
+#, fuzzy, c-format
+#| msgid "                                (only language C++)\n"
+msgid "                                (only XML based languages)\n"
+msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:1138
+#, fuzzy, c-format
+#| msgid "      --qt                    recognize Qt format strings\n"
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
+
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:1171
 #, 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"
+msgstr ""
+"      --properties-output     çıktı bir Java .properties dosyasına yazılır\n"
+
+#: src/xgettext.c:1175
+#, fuzzy, c-format
+#| msgid "      --indent                indented output style\n"
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:1188
 #, 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:879
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:1192
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:1194
+#, fuzzy, c-format
+#| msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+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:1196
+#, c-format
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EPOSTA@ADRESİ\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:883
-#, c-format
-msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
+#: src/xgettext.c:1198
+#, fuzzy, c-format
+#| msgid ""
+#| "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:885
-#, c-format
-msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
+#: src/xgettext.c:1201
+#, fuzzy, c-format
+#| msgid ""
+#| "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+#| "entries\n"
+msgid ""
+"  -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:1649
+#: src/xgettext.c:1597
 #, c-format
-msgid "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"
+msgid ""
+"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:1750
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1872
+#, fuzzy
+#| msgid ""
+#| "The option --msgid-bugs-address was not specified.\n"
+#| "If you are using a `Makevars' file, please specify\n"
+#| "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+#| "specify an --msgid-bugs-address command line option.\n"
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"--msgid-bugs-address seçeneği belirtilmemiş.\n"
+"Bir `Makevars' dosyası kullanıyorsanız, burada\n"
+"MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
+"bir --msgid-bugs-address seçeneği kullanın.\n"
+
+#: src/xgettext.c:2088
+#, fuzzy, c-format
+#| msgid "language `%s' unknown"
+msgid "language '%s' unknown"
+msgstr "dil `%s' bilinmiyor"
+
+#: src/x-javascript.c:231
+#, fuzzy
+#| msgid ""
+#| "Non-ASCII string at %s%s.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s%s içinde ASCII olmayan dizge.\n"
+"Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
+
+#: src/x-javascript.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+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-javascript.c:291
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+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-javascript.c:303
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
+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-javascript.c:312
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
+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-javascript.c:344
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the source encoding through --from-code.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Çokbaytlı dizilim geçersiz.\n"
+"Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
+
+#: src/x-javascript.c:919
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+
+#: src/x-javascript.c:1027
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: invalid Unicode character"
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
+
+#: src/x-javascript.c:1041
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string"
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
+
+#: src/x-perl.c:339
+#, 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:1074
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: uyarı: "
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: \\x{HEXNUMBER} dizgesinde kapatan kuyruklu ayraç yok"
 
-#: src/xgettext.c:1933
+#: src/x-perl.c:1195
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Bir biçim dizgesi içinde kullanılabilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: %s\n"
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\l\") aradeğerlemesi geçersiz"
 
-#: src/xgettext.c:1934
+#: src/x-perl.c:1215
 #, c-format
-msgid "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"
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\u\") aradeğerlemesi geçersiz"
 
-#: src/xgettext.c:1965
+#: src/x-perl.c:1249
 #, 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:1262
+#, 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:1279
+#, 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:279
+#, 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"
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"'%s' biçim dizgesi isimsiz argümanlarla gerektiği gibi yerelleştirilemez:\n"
-"Çevirmen argümanları yeniden sıralayamaz.\n"
-"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"
+"%s%s içinde ASCII olmayan dizge.\n"
+"Lütfen, kaynak kodlamasını --from-code seçeneği ile ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
 
-#: src/xgettext.c:2023
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"Boş msgid, GNU gettext tarafından kullanılır:\n"
-"gettext(\"\") ile başlık girdilerindeki bilgileri\n"
-"döndürür. Boş dizge değildir.\n"
+"%s:%d: Çokbaytlı dizilim geçersiz.\n"
+"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
 
-#: src/xgettext.c:2626
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Çokbaytlı dizilim eksik kalmış.\n"
+"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
+
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Dosyanın sonunda çokbaytlı dizilim eksik kalmış.\n"
+"Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
+
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+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 ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d: Çokbaytlı dizilim geçersiz.\n"
+"Lütfen, kaynak kodlamasını --from-code seçeneği ile ya da\n"
+"http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
+"bir açıklama ile belirtiniz.\n"
+
+#: src/x-python.c:654
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
 
-#: src/xgettext.c:2653
+#: src/x-rst.c:116
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d: dizge ataması geçersiz"
 
-#: src/xgettext.c:2678
+#: src/x-rst.c:180
 #, 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"
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d:  # dan sonra sayı yok"
 
-#: src/xgettext.c:2699
+#: src/x-rst.c:215
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d: dizge ifade geçersiz"
 
-#: src/xgettext.c:2779
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a `Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: dizge ataması geçersiz"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: dizge ataması geçersiz"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
-"--msgid-bugs-address seçeneği belirtilmemiş.\n"
-"Bir `Makevars' dosyası kullanıyorsanız, burada\n"
-"MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
-"bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:2978
+#: src/x-sh.c:1101
 #, c-format
-msgid "language `%s' unknown"
-msgstr "dil `%s' bilinmiyor"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
+"kullanılmayacak; yerine eval_gettext kullanın"
+
+#: src/x-vala.c:616
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<isimsiz>"
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+#, fuzzy
+#| msgid "invalid control sequence"
+msgid "invalid UTF-8 sequence"
+msgstr "denetim dizisi geçersiz"
+
+#: libgettextpo/markup.c:377
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: %c"
+msgstr "Geçerli bir Java sınıfı ismi değil: %s"
+
+#: libgettextpo/markup.c:397
+#, fuzzy, c-format
+#| msgid "not a valid Java class name: %s"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "Geçerli bir Java sınıfı ismi değil: %s"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, fuzzy, c-format
+#| msgid "invalid control sequence"
+msgid "invalid character reference: %s"
+msgstr "denetim dizisi geçersiz"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr ""
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr ""
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr ""
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr ""
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr ""
+
+#: libgettextpo/markup.c:608
+#, fuzzy, c-format
+#| msgid "invalid endianness: %s"
+msgid "invalid entity reference: %s"
+msgstr "bayt sırası geçersiz: %s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr ""
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, fuzzy, c-format
+#| msgid "invalid argument %s for %s"
+msgid "invalid character after '%s'"
+msgstr "argüman %s, %s için geçersiz"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr ""
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr ""
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr ""
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr ""
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr ""
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr ""
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr ""
+
+#: libgettextpo/markup.c:1509
+#, fuzzy
+#| msgid "missing filter name"
+msgid "inside an attribute name"
+msgstr "süzgeç ismi eksik"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr ""
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr ""
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr ""
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr ""
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: `--%s' seçeneği bilinmiyor\n"
+
+#, c-format
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#, c-format
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: `-W %s' seçeneği belirsiz\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
+
+#, c-format
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "%%%c için çoklu başvuru."
+
+#, c-format, no-wrap
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Telif Hakkı (C) %s Free Software Foundation, Inc.\n"
+#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n"
+#~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
+#~ "UYGUNLUĞU için bile garanti verilmez.\n"
+
+#, c-format
+#~ msgid "Not yet implemented."
+#~ msgstr "Henüz çalışmıyor."
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "uyarı: PO dosya başlığı fuzzy\n"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
+#~ "C# .dll biçimi bağlamları desteklemiyor\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
+#~ "Java ResourceBundle biçimi bağlamları desteklemiyor\n"
+
+#, c-format
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "\"glade\" dili desteklenmiyor. %s expat'a bağlı.\n"
+#~ "Bu sürüm expat olmaksızın kurgulanmış.\n"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: uyarı: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Bir biçim dizgesi içinde kullanılabilirse de %s, %s biçim dizgesi içinde "
+#~ "geçerli değil. Sebebi: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "'%s' biçim dizgesi isimsiz argümanlarla gerektiği gibi "
+#~ "yerelleştirilemez:\n"
+#~ "Çevirmen argümanları yeniden sıralayamaz.\n"
+#~ "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"
+
+#~ 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 ""
+#~ "Boş msgid, GNU gettext tarafından kullanılır:\n"
+#~ "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
+#~ "döndürür. Boş dizge değildir.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
+
+#, 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"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 563b20457..b13864310 100644
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-01 14:57+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,20 +16,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
 "X-Generator: Lokalize 1.5\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "неправильний аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "неоднозначний аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Допустимі аргументи:"
 
@@ -57,201 +59,186 @@ msgstr "не вдається видалити тимчасовий катало
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "збереження прав доступу для %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "помилка при відкриванні «%s» для читання"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "не вдається відкрити резервний файл «%s» для запису"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "помилка читання «%s»"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "помилка запису «%s»"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "помилка після читання «%s»"
 
-#: 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/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "помилка у функції fdopen()"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Компілятор C# не знайдено, спробуйте встановити pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Не знайдено віртуальну машину pnet, спробуйте встановити pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "аварійне завершення створеного процесу %s"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: параметр «%s» не є однозначним\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: параметр «%s» не є однозначним. Можливі варіанти:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: невідомий параметр «%c%s»\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: додавання аргументів до параметра «%c%s» не передбачено\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: до параметра «--%s» слід додати аргумент\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: невідомий параметр «--%s»\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: невідомий параметр «%c%s»\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: некоректний параметр — «%c»\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: до параметра слід додати аргумент — «%c»\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: параметр «-W %s» не є однозначним\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "некоректний аргумент source_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "некоректний аргумент target_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не вдається створити «%s»"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "помилка запису файлу «%s»"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Компілятор Java не знайдено, встановіть gcj або встановіть змінну $JAVAC"
+msgstr ""
+"Компілятор Java не знайдено, встановіть gcj або встановіть змінну $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну $JAVA"
+msgstr ""
+"Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну "
+"$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "помилка вводу-виводу у дочірньому процесі %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "спроба створення потоків обробки зазнала невдачі"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "не вдається записати у дочірній процес %s"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "помилка читання з дочірнього процесу %s"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
+msgstr ""
+"не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "помилка зв'язку з дочірнім процесом %s"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "дочірній процес %s завершився з кодом %d"
@@ -275,13 +262,13 @@ msgstr "дочірній процес %s завершився з кодом %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "'"
 
@@ -290,64 +277,69 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "встановлення прав доступу для %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "не вдається створити канал"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "аварійне завершення _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не вдалося відновити fd %d: помилка dup2"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "дочірній процес %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "дочірній процес %s отримав фатальний сигнал %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Кореневим елементом має бути <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Елемент <%s> не містить елемента <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "У елемента <%s> немає атрибута <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n"
 
-#: src/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Користування: %s [ПАРАМЕТР...] [ЛОКАЛЬ ПРАВИЛА]...\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -363,7 +355,7 @@ msgstr ""
 "у gettext. Якщо аргумент не вказано, читає правила CLDR зі стандартного\n"
 "джерела вхідних даних.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -372,27 +364,29 @@ msgstr ""
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 "Те ж саме й для необов'язкових аргументів.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  вивести правила утворення форм множини у форматі CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  вивести правила утворення форм множини у "
+"форматі CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  вивести цю довідку та вийти\n"
 
-#: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
@@ -401,25 +395,30 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -428,136 +427,157 @@ msgstr ""
 "Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
 "Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
 
-#: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор програми %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s непридатний до читання"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "не вдалося видобути правила для %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "не вдалося обробити правило CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "зайвий операнд %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "помилка при відкриванні «%s» для читання"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "специфікації для аргументу %u, як у «%s», немає у «%s»"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "специфікації форматів у «%s» і «%s» для аргументу %u не збігаються"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Директива з номером %u починається з символу |, але не закінчується символом |."
+msgstr ""
+"Директива з номером %u починається з символу |, але не закінчується символом "
+"|."
 
 #: src/format.c:152
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "«%s» не є правильним рядком формату %s, на відміну від «%s». Причина: %s"
+msgstr ""
+"«%s» не є правильним рядком формату %s, на відміну від «%s». Причина: %s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "У директиві з номером %u, лексема після '<' не є назвою макросу специфікації формату. Допустимі назви макросів перелічені у розділі 7.8.1 стандарту ISO C 99."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"У директиві з номером %u, лексема після '<' не є назвою макросу специфікації "
+"формату. Допустимі назви макросів перелічені у розділі 7.8.1 стандарту ISO C "
+"99."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "У директиві з номером %u, лексема після '<' не завершується дужкою '>'."
+msgstr ""
+"У директиві з номером %u, лексема після '<' не завершується дужкою '>'."
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Рядок посилається на аргумент з номером %u, але ігнорується аргумент з номером %u."
+msgstr ""
+"Рядок посилається на аргумент з номером %u, але ігнорується аргумент з "
+"номером %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "кількості специфікацій формату у «%s» і «%s» не збігаються"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "У директиві з номером %u, дужка «{» не завершується номером аргументу."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "У директиві з номером %u, знак ',' не завершується числом."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Рядок закінчується у середині директиви: знайдено «{» без відповідної дужки «}»."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr ""
+"Рядок закінчується у середині директиви: знайдено «{» без відповідної дужки "
+"«}»."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Директива з номером %u закінчується неправильним символом «%c» замість «}»."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Директива з номером %u закінчується неправильним символом «%c» замість «}»."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Директива з номером %u закінчується неправильним символом замість «}»."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr "Рядок починається в середині директиви: знайдено «}» без відповідної дужки «{»."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr ""
+"Рядок починається в середині директиви: знайдено «}» без відповідної дужки "
+"«{»."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Рядок містить одну дужку «}» після директиви %u."
@@ -570,17 +590,25 @@ msgstr "У директиві з номером %u, некоректна ком�
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "У директиві з номером %u, не допускається визначник точності перед «%c»."
+msgstr ""
+"У директиві з номером %u, не допускається визначник точності перед «%c»."
 
 #: 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, номер аргументу для визначника точності має дорівнювати %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"В директиві з номером %u, номер аргументу для визначника точності має "
+"дорівнювати %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "У директиві з номером %u не допускається специфікація точності перед «%c»."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"У директиві з номером %u не допускається специфікація точності перед «%c»."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -617,93 +645,131 @@ msgid "The string ends in the middle of a directive."
 msgstr "Рядок закінчується посеред директиви."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Рядок посилається на аргументи як через абсолютні номери аргументів, так і через не нумеровані специфікації аргументів."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Рядок посилається на аргументи як через абсолютні номери аргументів, так і "
+"через не нумеровані специфікації аргументів."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "В директиві з номером %u, аргумент з номером 0 не є додатнім цілим."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "В директиві з номером %u, аргумент ширини з номером 0 не є додатнім."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "У директиві з номером %u, аргумент точності з номером 0 не є додатнім."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "У директиві з номером %u, символ «%c» не є допустимою специфікацією перетворення."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr ""
+"У директиві з номером %u, символ «%c» не є допустимою специфікацією "
+"перетворення."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "Символ, що завершує директиву з номером %u не є допустимою специфікацією перетворення."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr ""
+"Символ, що завершує директиву з номером %u не є допустимою специфікацією "
+"перетворення."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Рядок посилається на аргумент з номером %u несумісним способом."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "У директиві з номером %u, рядок «%s»  у неприпустимому стилі дати/часу."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"У директиві з номером %u, рядок «%s»  у неприпустимому стилі дати/часу."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "У директиві з номером %u, «%s» не завершується комою."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "У директиві з номером %u, рядок «%s» у неприпустимому форматі числа."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-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»."
+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»."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "У директиві з номером %u, вибір не містить номер."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "У директиві з номером %u, вибір містить число, яке не завершується '<', '#' чи «%s»."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"У директиві з номером %u, вибір містить число, яке не завершується '<', '#' "
+"чи «%s»."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "специфікація формату аргументу {%u}, тобто «%s», не існує у «%s»"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "специфікації форматів у «%s» і «%s» для аргументу {%u} не збігаються"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Рядок посилається на аргумент з номером %u, але ігноруються аргументи з номерами %u та %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Рядок посилається на аргумент з номером %u, але ігноруються аргументи з "
+"номерами %u та %u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "специфікації форматів для аргументів із номерами %u та %u немає у «%s», а ігнорувати можна лише один аргумент"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"специфікації форматів для аргументів із номерами %u та %u немає у «%s», а "
+"ігнорувати можна лише один аргумент"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -714,16 +780,30 @@ msgstr "помилка під час обробки: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-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»."
+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»."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "У директиві з номером %u, вказано надто багато параметрів; очікувалось не більше ніж %u параметр."
-msgstr[1] "У директиві з номером %u, вказано надто багато параметрів; очікувалось не більше ніж %u параметри."
-msgstr[2] "У директиві з номером %u, вказано надто багато параметрів; очікувалось не більше ніж %u параметрів."
+msgid ""
+"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."
+msgstr[0] ""
+"У директиві з номером %u, вказано надто багато параметрів; очікувалось не "
+"більше ніж %u параметр."
+msgstr[1] ""
+"У директиві з номером %u, вказано надто багато параметрів; очікувалось не "
+"більше ніж %u параметри."
+msgstr[2] ""
+"У директиві з номером %u, вказано надто багато параметрів; очікувалось не "
+"більше ніж %u параметрів."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -753,13 +833,18 @@ msgstr "У директиві з номером %u, вказано обидва
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "У директиві з номером %u, '~:[' не завершується двома реченнями, розділеними  '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"У директиві з номером %u, '~:[' не завершується двома реченнями, "
+"розділеними  '~;'."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "У директиві з номером %u, '~;' використовується у неправильній позиції."
+msgstr ""
+"У директиві з номером %u, '~;' використовується у неправильній позиції."
 
 #: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
@@ -776,15 +861,19 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "специфікації формату у «%s» не є підмножиною специфікацій у «%s»"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "У директиві з номером %u, специфікація розміру несумісна з специфікацією перетворення «%c»."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"У директиві з номером %u, специфікація розміру несумісна з специфікацією "
+"перетворення «%c»."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -803,17 +892,24 @@ msgstr "У директиві з номером %u «%c» не може розп
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "У директиві з номером %u у визначенні форматування не можна використовувати більший рівень вкладеності."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"У директиві з номером %u у визначенні форматування не можна використовувати "
+"більший рівень вкладеності."
 
 #: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "У директиві з номером %u вказано незавершену інструкцію щодо форматування."
+msgstr ""
+"У директиві з номером %u вказано незавершену інструкцію щодо форматування."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Рядок посилається як на аргументи з назвами, так і на аргументи без назв."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Рядок посилається як на аргументи з назвами, так і на аргументи без назв."
 
 #: src/format-python.c:354
 #, c-format
@@ -822,112 +918,138 @@ msgstr "Рядок посилається на аргумент з назвою
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "специфікації формату у «%s» очікують відображення, а специфікації у «%s» вимагають кортеж"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"специфікації формату у «%s» очікують відображення, а специфікації у «%s» "
+"вимагають кортеж"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "специфікації формату у «%s» очікують кортеж, а специфікації у «%s» очікують відображення"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"специфікації формату у «%s» очікують кортеж, а специфікації у «%s» очікують "
+"відображення"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "специфікація формату аргументу «%s», тобто «%s», не існує у «%s»"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "специфікації форматів у «%s» і «%s» для аргументу «%s» не збігаються"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "«%s» — простий рядок форматування, але «%s» не є таким рядком: цей рядок містить прапорець «L» або двоцифровий номер аргументу"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"«%s» — простий рядок форматування, але «%s» не є таким рядком: цей рядок "
+"містить прапорець «L» або двоцифровий номер аргументу"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Рядок посилається на змінну оболонки з не-ASCII назвою."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Рядок посилається на змінну оболонки з складним синтаксисом дужок оболонки. Цей синтаксис тут не підтримується з міркувань безпеки."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Рядок посилається на змінну оболонки з складним синтаксисом дужок оболонки. "
+"Цей синтаксис тут не підтримується з міркувань безпеки."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Рядок посилається на змінну оболонки, значення якої може бути іншим у функціях оболонки."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Рядок посилається на змінну оболонки, значення якої може бути іншим у "
+"функціях оболонки."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Рядок посилається на змінну оболонки з порожньою назвою."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "У директиві з номером %u символ «%c» не є цифрою від 1 до 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
 msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Вивести назву системи.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Формат виводу:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 коротка назва вузла\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long          довга назва вузла, включає повну доменну назву\n"
+"  -f, --fqdn, --long          довга назва вузла, включає повну доменну "
+"назву\n"
 "                              та псевдоніми\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси системи\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "не вдається отримати назву системи"
@@ -937,7 +1059,7 @@ msgstr "не вдається отримати назву системи"
 msgid "selector is not specified"
 msgstr "не вказано селектор"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "не вдалося створити контекст XPath"
@@ -947,28 +1069,28 @@ msgstr "не вдалося створити контекст XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "не вдалося обробити вираз XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "У вузлі «%s» не міститься «%s»"
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "некоректне значення атрибута «%s» для «%s»"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "кореневим елементом не є елемент «rules» у просторі назв %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "не вдалося прочитати %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "не вдалося визначити шлях розташування XPath: %s"
@@ -988,28 +1110,28 @@ msgstr "не вдалося прочитати файл XML %s"
 msgid "the root element is not \"locatingRules\""
 msgstr "кореневим елементом не є елемент «locatingRules»"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "допускається максимум один вхідний файл"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s та %s є взаємовиключними"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1018,288 +1140,343 @@ msgstr ""
 "Фільтрує повідомлення каталогу перекладів у відповідності до їх атрибутів,\n"
 "та маніпулює цими атрибутами.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Розташування вхідного файлу:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний файл PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів пошуку\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів "
+"пошуку\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Якщо вхідний файл не вказаний, або якщо вказано -, використовується стандартний ввід.\n"
+msgstr ""
+"Якщо вхідний файл не вказаний, або якщо вказано -, використовується "
+"стандартний ввід.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Розташування файлу виводу:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"Якщо файл виводу не вказаний, або якщо вказано знак -, результат записується\n"
+"Якщо файл виводу не вказаний, або якщо вказано знак -, результат "
+"записується\n"
 " у стандартний вивід.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Вибір повідомлень:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            зберегти перекладені, видалити неперекладені\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            зберегти перекладені, видалити неперекладені\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
-msgstr "      --untranslated          зберегти неперекладені, видалити перекладені\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
+msgstr ""
+"      --untranslated          зберегти неперекладені, видалити перекладені\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
+msgstr ""
+"      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
+msgstr ""
+"      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           видалити застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         зберегти застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Керування атрибутами:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             позначити всі повідомлення як 'fuzzy'\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
+msgstr ""
+"      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          позначити всі повідомлення застарілими\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        позначити всі повідомлення не застарілими\n"
+msgstr ""
+"      --clear-obsolete        позначити всі повідомлення не застарілими\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              якщо встановлено «fuzzy», зберегти попередні msgid\n"
+"      --previous              якщо встановлено «fuzzy», зберегти попередні "
+"msgid\n"
 "                              перекладених повідомлень\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        видалити \"previous msgid\" з усіх повідомлень\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        видалити \"previous msgid\" з усіх "
+"повідомлень\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --empty                 під час вилучення «fuzzy» спрожняти msgstr\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+"      --empty                 під час вилучення «fuzzy» спрожняти msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr "      --only-file=ФАЙЛ.po     обробляти лише елементи перелічені у ФАЙЛ.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgstr ""
+"      --only-file=ФАЙЛ.po     обробляти лише елементи перелічені у ФАЙЛ.po\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr "      --ignore-file=ФАЙЛ.po   обробляти лише елементи не перелічені у ФАЙЛ.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgstr ""
+"      --ignore-file=ФАЙЛ.po   обробляти лише елементи не перелічені у ФАЙЛ."
+"po\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синонім для --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              синонім для --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              синонім для --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис вхідного файлу:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr "  -P, --properties-input      вхідний файл має синтаксис Java .properties\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      вхідний файл має синтаксис Java .properties\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     вхідний файл має синтаксис NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     вхідний файл має синтаксис NeXTstep/GNUstep ."
+"strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробиці виводу:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
-"      --color                 використовувати кольори та інші атрибути тексту завжди\n"
-"      --color=УМОВА           використовувати кольори та інші атрибути тексту за УМОВИ.\n"
-"                              УМОВА може мати значення «always», «never», «auto» або «html».\n"
+"      --color                 використовувати кольори та інші атрибути "
+"тексту завжди\n"
+"      --color=УМОВА           використовувати кольори та інші атрибути "
+"тексту за УМОВИ.\n"
+"                              УМОВА може мати значення «always», «never», "
+"«auto» або «html».\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=ФАЙЛ_СТИЛЮ      вказати файл правил стилю CSS для --color\n"
+msgstr ""
+"      --style=ФАЙЛ_СТИЛЮ      вказати файл правил стилю CSS для --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             не використовувати у виводі символи екранування\n"
+"  -e, --no-escape             не використовувати у виводі символи "
+"екранування\n"
 "                              мови C (типово)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                використовувати у виводі символи екранування\n"
 "                              мови C, без розширених символів\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              записувати файл PO, навіть порожній\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                записати файл .po, вживаючи стиль з відступами\n"
+msgstr ""
+"  -i, --indent                записати файл .po, вживаючи стиль з "
+"відступами\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           не записувати рядки '#: назва_файлу:рядок'\n"
+msgstr ""
+"      --no-location           не записувати рядки '#: назва_файлу:рядок'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          створювати рядки '#: назва_файлу:рядок' (типово)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          створювати рядки '#: назва_файлу:"
+"рядок' (типово)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                записувати файл .po, точно відповідний Uniforum\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                записувати файл .po, точно відповідний "
+"Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записати файл Java .properties\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr "      --stringtable-output    записати файл NeXTstep/GNUstep .strings\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    записати файл NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          встановити ширину сторінки виводу\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1308,31 +1485,32 @@ msgstr ""
 "      --no-wrap               не розривати на декілька рядків довгі рядки\n"
 "                              повідомлень, що довші за ширину сторінки\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           сортувати вивід\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          сортувати вивід за розташуванням файлів\n"
+msgstr ""
+"  -F, --sort-by-file          сортувати вивід за розташуванням файлів\n"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1355,43 +1533,45 @@ msgstr ""
 "вказано --use-first, коментарі беруться з першого файла PO, у якому їх було\n"
 "визначено.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ ...            вхідні файли\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=ФАЙЛ       отримати перелік вхідних файлів з ФАЙЛ\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Якщо назвою вхідного файлу є -, використовується стандартний ввід.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: 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 ""
-"  -<, --less-than=ЧИСЛО       виводить повідомлення визначені менш ніж вказану\n"
+"  -<, --less-than=ЧИСЛО       виводить повідомлення визначені менш ніж "
+"вказану\n"
 "                              кількість разів, якщо значення не вказано,\n"
 "                              типове значення - нескінченість\n"
 
-#: src/msgcat.c:411
+#: 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 ""
-"  ->, --more-than=ЧИСЛО       виводить повідомлення визначені більш ніж вказану\n"
+"  ->, --more-than=ЧИСЛО       виводить повідомлення визначені більш ніж "
+"вказану\n"
 "                              кількість разів, якщо не вказано, типове\n"
 "                              значення дорівнює 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1400,14 +1580,16 @@ msgstr ""
 "  -u, --unique                скорочення для --less-than=2, вказує\n"
 "                              виводити лише унікальні повідомлення\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr "  -P, --properties-input      вхідні файли мають синтаксис Java .properties\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      вхідні файли мають синтаксис Java .properties\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1416,12 +1598,12 @@ msgstr ""
 "      --stringtable-input     вхідні файли мають синтаксис NeXTstep/GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=НАЗВА         кодування виводу\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1431,32 +1613,35 @@ msgstr ""
 "                              кожного повідомлення, не об'єднувати декілька\n"
 "                              перекладів\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=НАЗВА_КАТАЛОГУ   встановити значення поля «Language» у записі заголовка\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=НАЗВА_КАТАЛОГУ   встановити значення поля «Language» у записі "
+"заголовка\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "не вказані вхідні файли"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "потрібно рівно 2 вхідні файли"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Використання: %s [ПАРАМЕТР] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1473,72 +1658,77 @@ msgstr ""
 "у програмі. Якщо точну відповідність знайти не вдається, для покращення\n"
 "діагностики використовується приблизне порівняння.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      переклад\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     посилання на джерело\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Модифікатори режиму роботи:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     не використовувати неточну відповідність\n"
+msgstr ""
+"  -N, --no-fuzzy-matching     не використовувати неточну відповідність\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             використовувати неточні записи\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      використовувати неперекладені записи\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "це повідомлення не перекладене"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "це повідомлення повинен перевірити перекладач"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "це повідомлення використовується програмою, але не було визначено..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...проте це визначення є подібним"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "це повідомлення використовується, але не було визначене у %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "попередження: це повідомлення не використовується"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1546,12 +1736,12 @@ msgstr[0] "знайдено %d критичну помилку"
 msgstr[1] "знайдено %d критичні помилки"
 msgstr[2] "знайдено %d критичних помилок"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необхідно вказати принаймні два файли"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1572,7 +1762,7 @@ msgstr ""
 "беруться з першого файла PO, у якому вони були визначені. Коментарі з назвою\n"
 "файлу та номером рядка зберігаються для усіх файлів PO.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1582,65 +1772,70 @@ msgstr ""
 "                              кількістю визначень, якщо число не вказано,\n"
 "                              типове значення дорівнює 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           не записувати заголовок у записі «msgid \"\"»\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           не записувати заголовок у записі «msgid \"\"»\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Перетворює каталог перекладів у інше кодування.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Результат перетворення:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Типовим кодуванням є кодування поточної локалі.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                стиль виводу з відступами\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           не виводити '#: filename:line' рядки\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          зберігати рядки «#: назва файла:рядок» (типова поведінка)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          зберігати рядки «#: назва файла:рядок» (типова "
+"поведінка)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                стиль виводу Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "не вказано вхідний файл"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "потрібен лише один вхідний файл"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Використання:  %s [ПАРАМЕТР] ВХІДНИЙ_ФАЙЛ\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1652,22 +1847,22 @@ msgstr ""
 "файл PO або файл POT (зазвичай створений xgettext). Неперекладеним елементам\n"
 "призначається переклад, ідентичний до вмісту msgid.\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний PO або POT файл\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "не вказана назва команди"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР] КОМАНДА [ПАРАМЕТРИ-КОМАНДИ]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1682,7 +1877,7 @@ msgstr ""
 "виводом msgexec. Програма msgexec повертає максимальний з кодів завершення усіх\n"
 "викликів команди.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1691,61 +1886,63 @@ msgstr ""
 "Спеціальна вбудована команда з назвою '0' виводить переклад, який завершується\n"
 "нульовим байтом. Вивід команди \"msgexec 0\" підходить як ввід команди \"xargs -0\".\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Команди для вхідних даних:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   додавати новий рядок наприкінці вхідних даних\n"
+msgstr ""
+"  --newline                   додавати новий рядок наприкінці вхідних даних\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний файл PO\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "не вдається записати в стандартний вивід"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "не вказана назва фільтру"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "необхідно вказати принаймні один сценарій для sed"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР] ФІЛЬТР [ПАРАМЕТРИ-ФІЛЬТРУ]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Застосовує фільтр до всіх перекладів у каталозі.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, 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 ""
-"Фільтр може бути будь-якою програмою, що читає переклад зі стандартного вводу\n"
+"Фільтр може бути будь-якою програмою, що читає переклад зі стандартного "
+"вводу\n"
 "та записує змінений переклад у стандартний вивід.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Фільтрування вхідних і вихідних даних:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1754,118 +1951,129 @@ msgstr ""
 "  --newline                   додавати новий рядок наприкінці вхідних даних\n"
 "                                і вилучати новий рядок наприкінці результатів"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР є 'sed':\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СЦЕНАРІЙ   додати СЦЕНАРІЙ до виконуваних команд\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
-msgstr "  -f, --file=ФАЙЛ_СЦЕНАРІЮ    додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних команд\n"
+msgstr ""
+"  -f, --file=ФАЙЛ_СЦЕНАРІЮ    додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних "
+"команд\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       не виводити автоматично шаблони\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
-msgstr "      --no-escape             вимкнути у виводі екранування у стилі C (типово)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"      --no-escape             вимкнути у виводі екранування у стилі C "
+"(типово)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                стиль виводу з відступами\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           залишити заголовок незмінним, не фільтрувати його\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           залишити заголовок незмінним, не фільтрувати "
+"його\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "фільтрувати виведені дані, що не завершуються символом нового рядка"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s повинен бути поодиноким знаком пунктуації"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправильно вказано порядок байтів: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "якщо вказано %s та %s, файл вхідних даних вказувати не слід"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s вимагає вказати параметр \"-d каталог\""
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s вимагає вказати параметр \"-l локаль\""
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "для %s слід вказати специфікацію «--template шаблон»"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "для %s слід вказати специфікацію «-o файл»"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "не можна одночасно використовувати %s та %s у %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допускається лише з %s, %s або %s"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "не вдалося знайти правила ITS для %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1873,7 +2081,7 @@ msgstr[0] "%d перекладене повідомлення"
 msgstr[1] "%d перекладених повідомлення"
 msgstr[2] "%d перекладених повідомлень"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1881,7 +2089,7 @@ msgstr[0] ", %d неточний переклад"
 msgstr[1] ", %d неточних переклади"
 msgstr[2] ", %d неточних перекладів"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1889,106 +2097,131 @@ msgstr[0] ", %d неперекладене повідомлення"
 msgstr[1] ", %d неперекладених повідомлення"
 msgstr[2] ", %d неперекладених повідомлень"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Використання: %s [ПАРАМЕТР] назва_файлу.po ...\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створює двійковий каталог повідомлень з текстового опису.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  назва_файлу.po ...          вхідні файли\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим роботи:\n"
 
+#: src/msgfmt.c:931
+#, c-format
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  режим Java: створює Java ResourceBundle клас\n"
+
 #: src/msgfmt.c:933
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  режим Java: створює Java ResourceBundle клас\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 як і --java, вважається Java2 (JDK 1.2 чи "
+"вище)\n"
 
 #: src/msgfmt.c:935
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 як і --java, вважається Java2 (JDK 1.2 чи вище)\n"
+msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+msgstr "      --csharp                режим C#: створює файли .NET .dll\n"
 
 #: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                режим C#: створює файли .NET .dll\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      режим C# ресурсів: створює файл .NET ."
+"resources\n"
 
 #: src/msgfmt.c:939
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      режим C# ресурсів: створює файл .NET .resources\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
 
 #: src/msgfmt.c:941
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
-
-#: src/msgfmt.c:943
-#, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: створює файл Qt .qm\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               режим запису до desktop: створити файл .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               режим запису до desktop: створити файл ."
+"desktop\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   режим XML: створити файл XML\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                перейти у режим відповідності до Uniforum\n"
+msgstr ""
+"      --strict                перейти у режим відповідності до Uniforum\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
+msgstr ""
+"Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Розташування вхідного файлу у режимі Java:\n"
 
-#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       назва ресурсу\n"
 
-#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr "  -l, --locale=ЛОКАЛЬ         назва локалі, або мова або мова_КРАЇНА\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr "      --source                створити файл .java, а не файл .class\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d КАТАЛОГ                  базовий каталог ієрархії каталогів класів\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgstr ""
+"  -d КАТАЛОГ                  базовий каталог ієрархії каталогів класів\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -1996,17 +2229,21 @@ msgstr ""
 "після знаку підкреслення.  Параметр -d є обов'язковим.  Клас записується\n"
 "у вказаний каталог.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Розташування вхідного файлу у режимі C#:\n"
 
-#: src/msgfmt.c:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr "  -d КАТАЛОГ                  базовий каталог залежних від локалі .dll файлів\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+"  -d КАТАЛОГ                  базовий каталог залежних від локалі .dll "
+"файлів\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2015,39 +2252,44 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .dll записується у підкаталог\n"
 "вказаного каталогу, назва якого залежить від локалі.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Розташування вхідного файлу у режимі Tcl:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d КАТАЛОГ                  базовий каталог каталогів .msg повідомлень\n"
+msgstr ""
+"  -d КАТАЛОГ                  базовий каталог каталогів .msg повідомлень\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Параметри -l та -d є обов'язковими.  Файл .msg записується у вказаний каталог.\n"
+msgstr ""
+"Параметри -l та -d є обов'язковими.  Файл .msg записується у вказаний "
+"каталог.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Параметри режиму запису desktop:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr "  --template=ШАБЛОН           файл .desktop, який слід використати як шаблон\n"
+msgstr ""
+"  --template=ШАБЛОН           файл .desktop, який слід використати як "
+"шаблон\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d КАТАЛОГ                  базовий каталог для файлів .po\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2056,190 +2298,211 @@ msgstr ""
 "  -kСЛОВО, --keyword=СЛОВО    шукати СЛОВО як додаткове ключове слово\n"
 "  -k, --keyword               не використовувати типових ключових слів\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "Параметри -l, -o та --template є обов’язковими. Якщо вказано параметр -D\n"
 "файли вхідних даних буде прочитано з каталогу, а не з аргументів командного\n"
 "рядка.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Параметри режиму XML:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=НАЗВА         розпізнавати вказану мову XML\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
-msgstr "  --template=ШАБЛОН           файл XML, який слід використати як шаблон\n"
+msgstr ""
+"  --template=ШАБЛОН           файл XML, який слід використати як шаблон\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Інтерпретація вхідного файлу:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 виконати всі перевірки, що передбачені\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          перевірити залежний від мови формат рядків\n"
+msgstr ""
+"      --check-format          перевірити залежний від мови формат рядків\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          перевірити наявність та вміст елементу заголовка\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          перевірити наявність та вміст елементу "
+"заголовка\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          перевірити конфлікти між директивами домену та\n"
+"      --check-domain          перевірити конфлікти між директивами домену "
+"та\n"
 "                                параметром --output-file\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   перевірити, що GNU msgfmt поводиться як X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   перевірити, що GNU msgfmt поводиться як X/Open "
+"msgfmt\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  перевірити наявність клавіш-акселераторів у\n"
+"      --check-accelerators[=CHAR]  перевірити наявність клавіш-акселераторів "
+"у\n"
 "                                пунктах меню\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             виводити елементи неточного перекладу\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=ЧИСЛО       форматувати рядки по ЧИСЛО байт у рядку (типово: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=ЧИСЛО       форматувати рядки по ЧИСЛО байт у рядку "
+"(типово: %d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
-"      --endianness=ПОРЯДОК    записувати 32-бітові числа з вказаним порядком байтів\n"
+"      --endianness=ПОРЯДОК    записувати 32-бітові числа з вказаним порядком "
+"байтів\n"
 "                                (зворотний (big) або прямий (little),\n"
 "                                 типовий залежить від платформи)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               двійковий файл не буде включати хеш-таблицю\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               двійковий файл не буде включати хеш-таблицю\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            вивести статистику про переклад\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               збільшити рівень докладності виводу\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "попередження: заголовок файла PO відсутній або некоректний\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "попередження: перетворення кодувань символів не працюватиме\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "попередження: заголовок файла PO позначений як нечіткий переклад\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "попередження: старі версії msgfmt сприйматимуть це як помилку\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "назва домену «%s» не може використовуватись як назва файлу"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "назва домену «%s» не може використовуватись як назва файлу: буде використано префікс"
+msgstr ""
+"назва домену «%s» не може використовуватись як назва файлу: буде використано "
+"префікс"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "директиву «domain %s» проігноровано"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "порожній елемент «msgstr» проігноровано"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "елемент з нечітким перекладом «msgstr» проігноровано"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не існує"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s існує, але непридатний до читання"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "помилка при читанні «%s»"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "параметр «%c» не може використовуватись перед символами 'J', 'K', 'T', 'C' чи 'X'"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"параметр «%c» не може використовуватись перед символами 'J', 'K', 'T', 'C' "
+"чи 'X'"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2248,7 +2511,7 @@ msgstr ""
 "Отримати усі повідомлення з каталогу перекладу, які відповідають вказаному\n"
 "шаблону або належать до певних вказаних вхідних файлів.\n"
 
-#: src/msggrep.c:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2323,32 +2586,41 @@ msgstr ""
 "  -v, --invert-match          виводити лише повідомлення, які не відповідають\n"
 "                              жодному критерію відбору\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
-msgstr "      --escape                використовувати у виводі екранування у стилі C, без розширених символів\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"      --escape                використовувати у виводі екранування у стилі "
+"C, без розширених символів\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           сортувати інформацію, що виводиться\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          сортувати за розташуванням у файлах\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Ваше середовище індиферентне до мови. Будь ласка встановіть\n"
 "змінну середовища LANG, як описано у файлі ABOUT-NLS. Це необхідно,\n"
 "щоб ви мали змогу перевірити ваш переклад.\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2359,57 +2631,62 @@ msgstr ""
 "Вкажіть локаль у параметрі --locale, або вкажіть файл .po\n"
 "виводу у параметрі --output-file.\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створено %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний POT файл\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "Якщо не вказано вхідний файл, POT файл шукається у поточному каталозі.\n"
 "Якщо вказано -, файл читається зі стандартного вводу.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл PO\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"Якщо не вказано вхідний файл, назва залежить від параметру --locale або локалі\n"
+"Якщо не вказано вхідний файл, назва залежить від параметру --locale або "
+"локалі\n"
 "користувача. Якщо вказано знак -, результат виводиться у стандартний вивід.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          встановити цільову локаль\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
-msgstr "      --no-translator         вважати, що файл PO створений автоматично\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
+msgstr ""
+"      --no-translator         вважати, що файл PO створений автоматично\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2417,12 +2694,12 @@ msgstr ""
 "Знайдено більш ніж один .pot файл.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "помилка при читанні поточного каталогу"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2430,20 +2707,23 @@ msgstr ""
 "Не знайдено .pot файл у поточному каталозі.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "процес-нащадок %s завершився аварійно з кодом %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"Новий каталог повідомлень повинен містити вашу адресу електронної пошти, щоб\n"
+"Новий каталог повідомлень повинен містити вашу адресу електронної пошти, "
+"щоб\n"
 "користувачі могли звертатись до вас із зауваженнями щодо перекладу, та\n"
 "відповідальні за підтримку особи могли зв'язуватись з вами при виникненні\n"
 "технічних проблем.\n"
@@ -2451,44 +2731,49 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Переклад українською для пакету %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "у вхідному файлі два різні кодування «%s» та «%s»"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл «%s» не містить елемент заголовка, який вказує кодування"
 
-#: src/msgl-cat.c:208
+#: 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 "домен «%s» у вхідному файлі «%s» не містить елемент заголовку, який вказує кодування"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"домен «%s» у вхідному файлі «%s» не містить елемент заголовку, який вказує "
+"кодування"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "цільове кодування «%s» не є переносною назвою кодування."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2497,10 +2782,11 @@ msgstr ""
 "Вхідні файли містять повідомлення у інших кодуваннях, UTF-8 поміж інших.\n"
 "Вивід перетворюється у UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
@@ -2508,7 +2794,7 @@ msgstr ""
 "Вивід перетворюється у UTF-8.\n"
 "Щоб вибрати інше кодування виводу, використовуйте параметр --to-code.\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2518,10 +2804,11 @@ msgid ""
 msgstr ""
 "Перетворення файлу %s з кодування %s у кодування %s\n"
 "змінить деякі поля msgids чи msgctxts.\n"
-"Або перетворіть усі поля msgids msgctxts у кодування ASCII, або перевірте, що\n"
+"Або перетворіть усі поля msgids msgctxts у кодування ASCII, або перевірте, "
+"що\n"
 "вони вже у кодуванні UTF-8, тобто у файлах з текстом програми.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2534,12 +2821,12 @@ msgstr ""
 "Вивід «%s» може бути некоректним.\n"
 "Можливі обхідні шляхи:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2550,7 +2837,7 @@ msgstr ""
 "  потім застосувати «%s»,\n"
 "  потім перетворити назад на %s використовуючи 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2563,7 +2850,7 @@ msgstr ""
 "  потім застосувати «%s»,\n"
 "  потім перетворити назад у %s використовуючи 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2581,7 +2868,9 @@ msgstr "розширення множинних форм можуть дават
 #: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu, але розширення множинних форм можуть давати значення такі ж великі як і %lu"
+msgstr ""
+"nplurals = %lu, але розширення множинних форм можуть давати значення такі ж "
+"великі як і %lu"
 
 #: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
@@ -2589,11 +2878,16 @@ msgstr "розширення множинних форм можуть призв
 
 #: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
-msgstr "розширення множинних форм можуть призводити до переповнення цілого значення"
+msgstr ""
+"розширення множинних форм можуть призводити до переповнення цілого значення"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "розширення множинних форм можуть призводити до арифметичних виключних ситуацій, можливе ділення на нуль"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"розширення множинних форм можуть призводити до арифметичних виключних "
+"ситуацій, можливе ділення на нуль"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2642,23 +2936,29 @@ msgstr[1] "але деякі повідомлення мають %lu множи�
 msgstr[2] "але деякі повідомлення мають %lu множинних форм"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "каталог повідомлень має переклад з множинними формами, але заголовок не містить \"Plural-Forms: nplurals=ЦІЛЕ; plural=ВИРАЗ;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgstr ""
+"каталог повідомлень має переклад з множинними формами, але заголовок не "
+"містить \"Plural-Forms: nplurals=ЦІЛЕ; plural=ВИРАЗ;\""
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "обидва елементи «msgid» та «msgid_plural» не починаються одночасно з «\\n»"
+msgstr ""
+"обидва елементи «msgid» та «msgid_plural» не починаються одночасно з «\\n»"
 
 #: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "обидва елементи «msgid» та «msgstr[%u]» не починаються одночасно з «\\n»"
+msgstr ""
+"обидва елементи «msgid» та «msgstr[%u]» не починаються одночасно з «\\n»"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "елементи «msgid» та «msgstr» не починаються одночасно з «\\n»"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgid_plural» не закінчуються одночасно на «\\n»"
 
@@ -2667,11 +2967,11 @@ msgstr "елементи «msgid» та «msgid_plural» не закінчуют
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgstr[%u]» не закінчуються одночасно на «\\n»"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgstr» не закінчуються одночасно на «\\n»"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
 msgstr "обробка множинних форм є розширенням GNU gettext"
 
@@ -2703,15 +3003,15 @@ msgstr "Багатокрапка ASCII («...») замість символу �
 msgid "space before ellipsis found in user visible strings"
 msgstr "у видимих користувачеві рядках виявлено пробіл перед багатокрапкою"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Використано подвійні лапки ASCII замість лапок Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Використано одинарні лапки ASCII замість лапок Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "Кружок ASCII («%c») замість символу Unicode"
@@ -2726,37 +3026,49 @@ msgstr "%s: вхідний потік не є коректним для коду
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: помилка при перетворенні кодування з «%s» на «%s»"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл не містить заголовок, що вказує кодування"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Не вдається перетворити з «%s» на «%s». %s використовує iconv(), а iconv() не підтримує це перетворення."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Не вдається перетворити з «%s» на «%s». %s використовує iconv(), а iconv() "
+"не підтримує це перетворення."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Перетворення з «%s» у «%s» призводить до появи дублікатів: деякі msgid ключі стануть однаковими."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Перетворення з «%s» у «%s» призводить до появи дублікатів: деякі msgid ключі "
+"стануть однаковими."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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()."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s є допустимим лише разом з %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "тип резервної копії"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2779,17 +3091,17 @@ msgstr ""
 "у файл будуть збережені.  Якщо неможливо знайти точну відповідність,\n"
 "для отримання кращого результату використовується неточна відповідність.\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      переклади з посиланнями на старий код\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     посилання на новий код\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2798,7 +3110,7 @@ msgstr ""
 "  -C, --compendium=ФАЙЛ       додаткова бібліотека перекладів повідомлень,\n"
 "                              може бути вказано більш ніж один раз\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2807,30 +3119,33 @@ msgstr ""
 "  -U, --update                оновити def.po,\n"
 "                              нічого не робить, якщо def.po вже оновлений\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Розташування файлу виводу у режимі оновлення:\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Результат записується назад у def.po.\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛЬ       зробити резервну копію def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=СУФІКС         перевизначити звичайний суфікс резервної копії\n"
+msgstr ""
+"      --suffix=СУФІКС         перевизначити звичайний суфікс резервної "
+"копії\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2841,109 +3156,139 @@ msgstr ""
 "середовища VERSION_CONTROL.  Ось можливі значення:\n"
 "  none, off       не робити резервних копій (навіть якщо вказано --backup)\n"
 "  numbered, t     робити резервні копії з номерами\n"
-"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - прості\n"
+"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - "
+"прості\n"
 "  simple, never   завжди використовувати прості резервні копії\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Суфіксом резервної копії є «~», якщо він не перевизначений параметром --suffix\n"
+"Суфіксом резервної копії є «~», якщо він не перевизначений параметром --"
+"suffix\n"
 "або змінною середовища SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 розпізнавати рядки у форматі Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              зберегти попередні msgid перекладених повідомлень\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              зберегти попередні msgid перекладених "
+"повідомлень\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       не виводити індикатор поступу\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "це повідомлення повинно визначати множинні форми"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "це повідомлення не повинно визначати множинні форми"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sПрочитано %ld старих + %ld посилань, об'єднано %ld, неточних %ld, відсутніх %ld, застарілих %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sПрочитано %ld старих + %ld посилань, об'єднано %ld, неточних %ld, "
+"відсутніх %ld, застарілих %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " виконано.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Перетворює двійковий каталог повідомлень у файл .po Uniforum-стилю.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java режим: вхід є класом Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java режим: вхід є класом Java ResourceBundle\n"
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                C# режим: вхідний файл у форматі .NET .dll\n"
+msgstr ""
+"      --csharp                C# режим: вхідний файл у форматі .NET .dll\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      режим C# ресурсів: вхідний файл у форматі .NET .resources\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      режим C# ресурсів: вхідний файл у форматі ."
+"NET .resources\n"
 
-#: src/msgunfmt.c:447
+#: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl режим: вхідний файл у форматі tcl/msgcat ."
+"msg\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ФАЙЛ ...                    вхідні файли .mo\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Розташування вхідних файлів у Java режимі:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Назва класу визначається шляхом додавання назви локалі до назви ресурсу,\n"
-"відокремлюється символом підкреслення. Клас шукається з використанням CLASSPATH.\n"
+"відокремлюється символом підкреслення. Клас шукається з використанням "
+"CLASSPATH.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Розташування вхідного файлу у C# режимі:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2952,12 +3297,12 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .dll шукається у підкаталозі\n"
 "вказаного каталогу, назва якого залежить від локалі.\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Розташування вхідного файлу у Tcl режимі:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2966,17 +3311,19 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .msg шукається у вказаному\n"
 "каталозі.\n"
 
-#: src/msgunfmt.c:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                використовувати стиль виводу з відступами\n"
+msgstr ""
+"  -i, --indent                використовувати стиль виводу з відступами\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                виводити у точній відповідності до uniforum\n"
+msgstr ""
+"      --strict                виводити у точній відповідності до uniforum\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2997,17 +3344,21 @@ msgstr ""
 "параметр --use-first, вони беруться від першого перекладу.  Позиції у файлах\n"
 "будуть зібрані до купи.  При використанні --unique, дублікати відкидаються.\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              виводити лише дублікати\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                виводити лише унікальні повідомлення, без дублікатів\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                виводити лише унікальні повідомлення, без "
+"дублікатів\n"
 
-#: src/open-catalog.c:57 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>"
@@ -3061,34 +3412,35 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Кодування у заголовку відсутнє.\n"
-"Перетворення повідомлення у вказане користувачем кодування може не працювати.\n"
+"Перетворення повідомлення у вказане користувачем кодування може не "
+"працювати.\n"
 
 #: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "несумісне використання #~"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "пропущено розділ «msgstr[]»"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "пропущено розділ «msgid_plural»"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "пропущено розділ «msgstr»"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "перша множинна форма має ненульовий індекс"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "множинна форма має неправильний індекс"
@@ -3098,7 +3450,7 @@ msgstr "множинна форма має неправильний індекс
 msgid "too many errors, aborting"
 msgstr "надто багато помилок, виконання перервано"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неправильна мультибайтна послідовність"
@@ -3108,41 +3460,41 @@ msgstr "неправильна мультибайтна послідовніст
 msgid "incomplete multibyte sequence at end of file"
 msgstr "незавершена мультибайтна послідовність наприкінці файлу"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "незавершена мультибайтна послідовність наприкінці рядка"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "помилка при iconv"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невідоме ключове слово «%s»"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "неправильна керівна послідовність"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "кінець файлу посеред рядка"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "кінець рядка посеред рядка"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "розділювач контексту <EOT> посеред рядка"
 
-#: src/read-catalog.c:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "цей файл не може містити доменних директив"
@@ -3172,7 +3524,7 @@ msgstr "після «%s» пропущено «=»"
 msgid "invalid non-blank line"
 msgstr "некоректний непорожній рядок"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл «%s» обрізаний"
@@ -3182,29 +3534,45 @@ msgstr "файл «%s» обрізаний"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл «%s» містить рядок з не-NUL завершенням"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "файл «%s» містить рядок з не-NUL завершенням"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файл «%s» не у GNU .mo форматі"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл «%s» містить рядок з не-NUL завершенням, у %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "попередження: неправильний синтаксис \\uxxxx символу Юнікоду"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: попередження: одиничний замінник U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "попередження: некоректний символ Unicode"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "попередження: незавершений рядок"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "попередження: синтаксична помилка"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "попередження: незавершена пара ключ/значення"
 
@@ -3212,11 +3580,11 @@ msgstr "попередження: незавершена пара ключ/зн�
 msgid "warning: syntax error, expected ';' after string"
 msgstr "попередження: синтаксична помилка, після рядка очікувався знак ';'"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "попередження: синтаксична помилка, після рядка очікується '=' або ';'"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Автор програми %s та %s.\n"
@@ -3225,16 +3593,16 @@ msgstr "Автор програми %s та %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Перекодувати сербський текст із кирилиці у латиницю.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3243,27 +3611,27 @@ msgstr ""
 "Вхідний текст читається зі стандартного потоку вводу.  Перетворений текст\n"
 "виводиться у стандартний потік виводу.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "вхідний потік не є коректним для кодування «%s»"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "помилка при перетворення з кодування «%s» на «%s»"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "очікувалось два аргументи"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Використання : %s [ПАРАМЕТР] URL ФАЙЛ\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3272,111 +3640,138 @@ msgstr ""
 "Витягує та виводить вміст URL.  Якщо URL недоступний,\n"
 "натомість використовується локально доступний ФАЙЛ.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "помилка читання «%s»"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "помилка при записі у стандартний вивід"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "помилка після читання «%s»"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Отримання %s…"
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " перевищено час очікування.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " невдало.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Не можна виводити декілька доменів перекладу у єдиний файл з вказаним форматом. Спробуйте натомість використати PO синтаксис."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Не можна виводити декілька доменів перекладу у єдиний файл з вказаним "
+"форматом. Спробуйте натомість використати PO синтаксис."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Не можна виводити декілька доменів перекладу у єдиний файл з вказаним форматом виводу."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Не можна виводити декілька доменів перекладу у єдиний файл з вказаним "
+"форматом виводу."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "каталог повідомлень містить залежний від контексту переклад, але контексти не підтримуються форматом виводу."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"каталог повідомлень містить залежний від контексту переклад, але контексти "
+"не підтримуються форматом виводу."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "каталог повідомлень має переклад з множинними формами, але формат виводу їх не підтримує. Спробуйте створити Java клас використовуючи \"msgfmt --java\", замість створення файлу властивостей."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"каталог повідомлень має переклад з множинними формами, але формат виводу їх "
+"не підтримує. Спробуйте створити Java клас використовуючи \"msgfmt --java\", "
+"замість створення файлу властивостей."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "каталог повідомлень має переклад з множинними формами, але формат виводу їх не підтримує."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"каталог повідомлень має переклад з множинними формами, але формат виводу їх "
+"не підтримує."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не вдається створити файл виводу «%s»"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "стандартний вивід"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не вдається створити каталог «%s»"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "помилка при компіляції класу C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "помилка при відкриванні «%s» для запису"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "не є правильною назвою класу Java: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
+msgstr ""
+"помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "помилка при компіляції класу Java, спробуйте встановити значення $JAVAC"
+msgstr ""
+"помилка при компіляції класу Java, спробуйте встановити значення $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "незавершена мультибайтна послідовність"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "інтернаціоналізовані повідомлення не повинні містити керівну послідовність «\\%c»"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr ""
+"інтернаціоналізовані повідомлення не повинні містити керівну послідовність "
+"«\\%c»"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3389,7 +3784,7 @@ msgstr ""
 "вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3412,12 +3807,15 @@ msgstr ""
 
 #: src/write-qt.c:694
 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"
-"але формат каталогу повідомлень Qt підтримує Юнікод лише у полях перекладених\n"
+"каталог повідомлень має msgctxt рядки з символи за межами кодування "
+"ISO-8859-1\n"
+"але формат каталогу повідомлень Qt підтримує Юнікод лише у полях "
+"перекладених\n"
 "рядків, а не у рядках контексту\n"
 
 #: src/write-qt.c:718
@@ -3426,15 +3824,17 @@ 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"
-"але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених рядках\n"
+"каталог повідомлень має msgid рядки з символи за межами кодування "
+"ISO-8859-1\n"
+"але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених "
+"рядках\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "помилка при записі у «%s» дочірній процес"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3442,7 +3842,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад\n"
 "але формат каталогу ресурсів C# не підтримує контексти\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3450,7 +3850,7 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами\n"
 "але формат каталогу ресурсів C# не підтримує множинні форми\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3458,7 +3858,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад\n"
 "але формат каталогу повідомлень Tcl не підтримує контексти\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3466,36 +3866,56 @@ msgstr ""
 "каталог повідомлень містить переклад з множинними формами\n"
 "але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: попередження: незавершений рядок"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: попередження: незавершений регулярний вираз"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "попередження: некоректний символ Unicode"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: попередження: неправильний символ Юнікоду"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: попередження: незавершений символьний літерал"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: попередження: незавершений символьний літерал"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: попередження: незавершений символьний літерал"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: попередження: незавершений символьний літерал"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Вкажіть вхідне кодування у параметрі --from-code."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3504,7 +3924,7 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3513,7 +3933,7 @@ msgstr ""
 "%s:%d: Довга незавершена мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3522,7 +3942,7 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3531,12 +3951,12 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: помилка iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3545,119 +3965,146 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: попередження: неправильний символ Юнікоду"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: попередження: знайдено ')' там де очікувалась «}»"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: попередження: знайдено «}» там де очікувалась ')'"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr "«%s» не є коректною назвою кодування. Використовуємо резервне кодування ASCII.\n"
+msgstr ""
+"«%s» не є коректною назвою кодування. Використовуємо резервне кодування "
+"ASCII.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "невідома перевірка синтаксису, «%s»"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "невідомий тип завершення речення, «%s»"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-existing не може використовуватись, якщо вивід направляється у стандартний вивід"
+msgstr ""
+"--join-existing не може використовуватись, якщо вивід направляється у "
+"стандартний вивід"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може працювати без вказаних ключових слів для пошуку"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "попередження: файла правил ITS «%s» не існує"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "попередження: файла правил ITS «%s» не існує; перевірте, чи належним чином встановлено gettext"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"попередження: файла правил ITS «%s» не існує; перевірте, чи належним чином "
+"встановлено gettext"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
+msgstr ""
+"попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
 
-#: src/xgettext.c:1040
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Витягує рядки для перекладу з вказаних вхідних файлів.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, 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"
+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:1065
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ФАЙЛ           записувати вивід у вказаний файл\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=КАТАЛОГ    файли виводу будуть створені у каталозі КАТАЛОГ\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=КАТАЛОГ    файли виводу будуть створені у каталозі "
+"КАТАЛОГ\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Вибір мови вхідного файлу:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=НАЗВА         розпізнавати вказану мову\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   скорочення для --language=C++\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr "Типово, мова визначається за розширенням назви вхідного файлу.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3666,35 +4113,41 @@ msgstr ""
 "      --from-code=НАЗВА       кодування для вхідних файлів\n"
 "                                (за винятком Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Типово, вважається, що вхідні файли у кодуванні ASCII.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         об'єднати повідомлення з існуючим файлом\n"
+msgstr ""
+"  -j, --join-existing         об'єднати повідомлення з існуючим файлом\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=ФАЙЛ.po  елементи з ФАЙЛ.po не будуть витягуватись\n"
+msgstr ""
+"  -x, --exclude-file=ФАЙЛ.po  елементи з ФАЙЛ.po не будуть витягуватись\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
-"  -cТЕҐ, --add-comments[=ТЕҐ] вставляє блок коментарів з ТЕҐ-ом і попередніми\n"
-"                               рядками ключових слів у файлі виведених даних\n"
-"  -c, --add-comments          вставляє всі блоки коментарів, яким передують рядки\n"
+"  -cТЕҐ, --add-comments[=ТЕҐ] вставляє блок коментарів з ТЕҐ-ом і "
+"попередніми\n"
+"                               рядками ключових слів у файлі виведених "
+"даних\n"
+"  -c, --add-comments          вставляє всі блоки коментарів, яким передують "
+"рядки\n"
 "                               ключових слів у файлі виведених даних\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3705,7 +4158,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3716,245 +4169,199 @@ msgstr ""
 "                                (одинарний пробіл, типовий варіант, \n"
 "                                 або подвійний пробіл)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметри особливі для мови:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           витягнути усі рядки\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (лише мови C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (лише мови C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-код, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
 "                              аргументу АРГ ключового слова СЛОВО\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (лише мови C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
+msgstr ""
+"  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (лише мови C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=ФАЙЛ              застосувати правила ITS з ФАЙЛа\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (лише мови, засновані на XML)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (лише мова C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   розпізнати рядки у форматуванні KDE 4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 розпізнавати рядки у форматі Boost\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 докладніший результат пошуку рядків формату\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 докладніший результат пошуку рядків формату\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     виводити у файл Java .properties\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               записувати коментарі itstool\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          пропускати у виводі FSF copyright для сторонніх користувачів\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          пропускати у виводі FSF copyright для "
+"сторонніх користувачів\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
+msgstr ""
+"      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених даних\n"
+msgstr ""
+"      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених "
+"даних\n"
 
-#: src/xgettext.c:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у msgid\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у "
+"msgid\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[РЯДОК], --msgstr-prefix[=РЯДОК]    вживати РЯДОК або \"\" як префікс елементів\n"
+"  -m[РЯДОК], --msgstr-prefix[=РЯДОК]    вживати РЯДОК або \"\" як префікс "
+"елементів\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[РЯДОК], --msgstr-suffix[=РЯДОК]    вживати РЯДОК або \"\" як суфікс елементів\n"
+"  -M[РЯДОК], --msgstr-suffix[=РЯДОК]    вживати РЯДОК або \"\" як суфікс "
+"елементів\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:2040
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:[pass-]<flag>: %s"
-
-#: src/xgettext.c:2165
-msgid "standard input"
-msgstr "стандартний ввід"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Символ, що не належить до ASCII, у %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Коментар не у форматі ASCII на позиції або перед %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Рядок не у форматі ASCII на позиції %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: попередження: "
-
-#: src/xgettext.c:2448
-#, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Хоча й використовується у позиції рядку формату, %s не є правильним %s рядком формату. Причина: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: %s\n"
-
-#: src/xgettext.c:2480
+#: src/xgettext.c:1597
 #, c-format
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Рядок формату «%s» з аргументами без назв неможливо локалізувати:\n"
-"Перекладач не зможе змінити порядок аргументів.\n"
-"Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
-"що мають назву та їх підстановку.\n"
-
-#: src/xgettext.c:2545
-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 ""
-"Порожній msgid.  Він зарезервований GNU gettext:\n"
-"gettext(\"\") повертає елемент заголовку\n"
-"метаінформації, а не порожній рядок.\n"
-
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "неоднозначно вказане ключове слово '%.*s'"
+"Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:"
+"[pass-]<flag>: %s"
 
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
-
-#: src/xgettext.c:3334
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "попередження: відсутній контекст для множинного аргументу ключового слова '%.*s'"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "невідповідність контексту між формою однини та множини"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "стандартний ввід"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3966,21 +4373,16 @@ msgstr ""
 "тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
 "вкажіть --msgid-bugs-address аргумент командного рядка.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "невідома мова «%s»"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: попередження: одиничний замінник U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3989,7 +4391,7 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3998,7 +4400,7 @@ msgstr ""
 "%s:%d: Довга незавершена мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4007,7 +4409,7 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4016,7 +4418,7 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4025,145 +4427,196 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: попередження: не можна використовувати %s"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: попередження: незавершена розмітка XML"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: не вдається знайти символ завершення рядка «%s» до EOF"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: відсутня права фігурна дужка у \\x{ШІСТН.ЧИСЛО}"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\l\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\u\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неправильна інтерполяція змінної у \"%c\""
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\L\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\U\") 8-бітного символу \"%c\""
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Довга незавершена мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Невідоме кодування «%s». Вважається кодування ASCII."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправильне визначення рядка"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: після знаку # відсутнє число"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправильний символьний вираз"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: неправильне визначення рядка"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: неправильне визначення рядка"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; натомість використовуйте eval_gettext"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/x-vala.c:414
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; "
+"натомість використовуйте eval_gettext"
+
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
@@ -4294,8 +4747,108 @@ msgstr "у коментарі або інструкції обробки"
 msgid "document ended unexpectedly: %s"
 msgstr "неочікуване завершення документа: %s"
 
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: невідомий параметр «--%s»\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: параметр «-W %s» не є однозначним\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "попередження: заголовок файла PO позначений як нечіткий переклад\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "попередження: старі версії msgfmt сприйматимуть це як помилку\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Символ, що не належить до ASCII, у %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Коментар не у форматі ASCII на позиції або перед %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Рядок не у форматі ASCII на позиції %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: попередження: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Хоча й використовується у позиції рядку формату, %s не є правильним %s "
+#~ "рядком формату. Причина: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: "
+#~ "%s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Рядок формату «%s» з аргументами без назв неможливо локалізувати:\n"
+#~ "Перекладач не зможе змінити порядок аргументів.\n"
+#~ "Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
+#~ "що мають назву та їх підстановку.\n"
+
+#~ 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 ""
+#~ "Порожній msgid.  Він зарезервований GNU gettext:\n"
+#~ "gettext(\"\") повертає елемент заголовку\n"
+#~ "метаінформації, а не порожній рядок.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "неоднозначно вказане ключове слово '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr ""
+#~ "попередження: відсутній контекст для множинного аргументу ключового слова "
+#~ "'%.*s'"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "невідповідність контексту між формою однини та множини"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
-#~ msgstr "У коректному файлі CLDR не можна використовувати кореневий елемент <%s>"
+#~ msgstr ""
+#~ "У коректному файлі CLDR не можна використовувати кореневий елемент <%s>"
 
 #~ msgid "Missing context for the string extracted from '%s' element"
 #~ msgstr "Для рядка, видобутого з елемента «%s», не вказано контексту"
@@ -4327,12 +4880,16 @@ msgstr "неочікуване завершення документа: %s"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Авторські права (C) %s Free Software Foundation, Inc.\n"
-#~ "Це - вільне програмне забезпечення; умови копіювання викладені у вихідному\n"
-#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n"
+#~ "Це - вільне програмне забезпечення; умови копіювання викладені у "
+#~ "вихідному\n"
+#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ "
+#~ "ПРИДАТНОСТІ\n"
 #~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
 
 #~ msgid "Not yet implemented."
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index 7f36d478b..fdd47e457 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2016-06-01 17:28+0900\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
 "PO-Revision-Date: 2016-06-02 07:42+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -17,21 +17,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "đối số “%s” cho “%s” không hợp lệ"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "đối số “%s” cho “%s” chưa rõ ràng"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "Các đối số hợp lệ là:"
 
@@ -59,201 +60,187 @@ msgstr "không thể xóa bỏ thư mục tạm thời %s"
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:214
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "đang bảo tồn quyền hạn cho %s"
 
-#: gnulib-lib/copy-file.c:191
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "gặp lỗi khi mở %s để đọc"
 
-#: gnulib-lib/copy-file.c:195
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "không thể mở tập tin sao lưu %s để ghi"
 
-#: gnulib-lib/copy-file.c:199
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "lỗi đọc %s"
 
-#: gnulib-lib/copy-file.c:203
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "lỗi ghi %s"
 
-#: gnulib-lib/copy-file.c:207
+#: gnulib-lib/copy-file.c:191
 #, c-format
 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 src/msginit.c:1396
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() gặp lỗi"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "Không tìm thấy trình biên dịch C#, hãy thử cài đặt pnet."
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
 msgstr "Không tìm thấy máy ảo C#, hãy thử cài đặt pnet."
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Tiến trình con “%s” gặp lỗi"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: tùy chọn “%s” chưa rõ ràng\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, 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:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%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:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: tùy chọn “%s” yêu cầu một đối số\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: không nhận ra tùy chọn “--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, 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:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tùy chọn cần một đối số -- “%c”\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, 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:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "đối số “source_version” (phiên bản nguồn) không hợp lệ đối với “compile_java_class” (biên dịch lớp Java)"
+msgstr ""
+"đối số “source_version” (phiên bản nguồn) không hợp lệ đối với "
+"“compile_java_class” (biên dịch lớp Java)"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-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 lớp Java)"
+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 lớp Java)"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
-#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gặp lỗi khi tạo “%s”"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
-#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
-#: src/write-tcl.c:223 src/write-xml.c:75
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "gặp lỗi khi ghi tập tin “%s”"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Không tìm thấy trình biên dịch Java, hãy thử cài đặt gcj hoặc đặt $JAVAC"
+msgstr ""
+"Không tìm thấy trình biên dịch Java, hãy thử cài đặt gcj hoặc đặt $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 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:905 src/msginit.c:980
-#: src/msginit.c:1140 src/msginit.c:1404
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s lỗi V/R tiến trình con"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
-#: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "cạn bộ nhớ"
 
-#: gnulib-lib/pipe-filter-ii.c:316
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "việc tạo tuyến trình gặp lỗi"
 
-#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
 
-#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "gặp lỗi khi đọc từ tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:422
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "không thể cài đặt V/R không chặn đối với tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:460
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "gặp lỗi khi liên lạc với tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:580
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
@@ -277,13 +264,13 @@ msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:347
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "“"
 
-#: gnulib-lib/quotearg.c:348
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "”"
 
@@ -292,64 +279,69 @@ msgstr "”"
 msgid "setting permissions for %s"
 msgstr "đang đặt quyền hạn cho %s"
 
-#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
-#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "không thể tạo ống dẫn"
 
-#: gnulib-lib/w32spawn.h:45
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gặp lỗi"
 
-#: gnulib-lib/w32spawn.h:86
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "không phục hồi được bộ mô tả tập tin %d: dup2 gặp lỗi"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s tiến trình con"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s tiến trình con nhận được tín hiệu nghiêm trọng %d"
 
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
 msgstr "Phần tử gốc không phải là <%s>"
 
-#: src/cldr-plurals.c:83
+#: src/cldr-plurals.c:82
 #, c-format
 msgid "The element <%s> does not contain a <%s> element"
 msgstr "Phần tử <%s> không được phép chứa một phần tử <%s>"
 
-#: src/cldr-plurals.c:105 src/cldr-plurals.c:146
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
 msgstr "Phần tử <%s> không được phép có thuộc tính <%s>"
 
-#: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
-#: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
-#: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1032
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
 #, 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/cldr-plurals.c:195
+#: src/cldr-plurals.c:192
 #, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
 msgstr "Cách dùng: %s [CÁC TÙY CHỌN…] [CÁC QUY TẮC ĐỊA PHƯƠNG]…\n"
 
-#: src/cldr-plurals.c:200
+#: src/cldr-plurals.c:197
 #, c-format, no-wrap
 msgid ""
 "Extract or convert Unicode CLDR plural rules.\n"
@@ -365,7 +357,7 @@ msgstr ""
 "phù hợp với các dùng gettext. Nếu không đưa ra tham số nào, nó\n"
 "đọc quy tắc số nhiều CLDR từ đầu vào tiêu chuẩn.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,27 +366,28 @@ msgstr ""
 "Tất cả đối số bắt buộc phải có với tùy chọn dài cũng bắt buộc với tùy chọn ngắn.\n"
 "Cũng vậy với đối số kiểu tùy chọn.\n"
 
-#: src/cldr-plurals.c:214
+#: src/cldr-plurals.c:211
 #, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -c, --cldr                  in quy tắc số nhiều theo định dạng CLDR\n"
-
-#: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
-#: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
-#: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1220
+msgstr ""
+"  -c, --cldr                  in quy tắc số nhiều theo định dạng CLDR\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
 #, 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/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
-#: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
-#: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1222
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
 #, 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"
@@ -403,27 +396,33 @@ 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/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
-#: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
-#: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1229
+#: src/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
 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"
-"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi.html>.\n"
-
-#: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
-#: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
-#: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:681
-#, c-format, no-wrap
+"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi."
+"html>.\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -432,136 +431,156 @@ 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/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
-#: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Viết bởi %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cldr-plurals.c:295
+#: src/cldr-plurals.c:293
 msgid "Daiki Ueno"
 msgstr "Daiki Ueno"
 
-#: src/cldr-plurals.c:315
+#: src/cldr-plurals.c:313
 #, c-format
 msgid "%s cannot be read"
 msgstr "%s không thể đọc được"
 
-#: src/cldr-plurals.c:321
+#: src/cldr-plurals.c:319
 #, c-format
 msgid "cannot extract rules for %s"
 msgstr "không thể trích quy tắc cho %s"
 
-#: src/cldr-plurals.c:331
+#: src/cldr-plurals.c:329
 #, c-format
 msgid "cannot parse CLDR rule"
 msgstr "không thể phân tích quy tắc CLDR"
 
-#: src/cldr-plurals.c:366
+#: src/cldr-plurals.c:364
 #, c-format
 msgid "extra operand %s"
 msgstr "gặp một toán hạng thừa %s"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
-#: src/xgettext.c:2197
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "gặp lỗi khi mở “%s” để đọc"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-javascript.c:356
-#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
-#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "một đặc tả định dạng cho đối số %u, như trong “%s”, không tồn tại trong “%s”"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"một đặc tả định dạng cho đối số %u, như trong “%s”, không tồn tại trong “%s”"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-javascript.c:367
-#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
-#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
-#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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 "một đặc tả định dạng cho đối số %u cũng không tồn tại trong “%s”"
 
-#: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:390
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
-msgstr "đặc tả định dạng trong “%s” và “%s” cho đối số %u không phải trùng nhau"
+msgstr ""
+"đặc tả định dạng trong “%s” và “%s” cho đối số %u không phải trùng nhau"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "Chỉ thị số %u bắt đầu với ký hiệu ống dẫn “|” nhưng không kết thúc với “|”."
+msgstr ""
+"Chỉ thị số %u bắt đầu với ký hiệu ống dẫn “|” nhưng không kết thúc với “|”."
 
 #: src/format.c:152
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "“%s” không phải là một chuỗi định dạng %s đúng, không giống với “%s”. Lý do: %s"
+msgstr ""
+"“%s” không phải là một chuỗi định dạng %s đúng, không giống với “%s”. Lý do: "
+"%s"
 
-#: src/format-c.c:37
+#: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” không phải là tên của vĩ lệnh đặc tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 chương 7.8.1."
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"Trong chỉ thị số %u, thẻ bài nằm sau “<” không phải là tên của vĩ lệnh đặc "
+"tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 chương "
+"7.8.1."
 
-#: src/format-c.c:40
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” mà không có “>” đi theo. "
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Chuỗi này tham chiệu đến đối số có số %u nhưng mà bỏ qua đối số có số %u."
+msgstr ""
+"Chuỗi này tham chiệu đến đối số có số %u nhưng mà bỏ qua đối số có số %u."
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "“%s” và “%s” không có cùng một số các đặc tả định dạng"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "Trong chỉ thị số %u, dấu ngoặc móc mở “{” không có số đối số đi theo."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Trong chỉ thị số %u, dấu phẩy “,” không có một con số đi theo."
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Chuỗi này kết thúc ở giữa chỉ thị: “{” mà không có “}” tương ứng."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "Chỉ thị số %u kết thúc với ký tự không hợp lệ “%c” thay vì dấu ngoặc móc đóng “}”."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr ""
+"Chỉ thị số %u kết thúc với ký tự không hợp lệ “%c” thay vì dấu ngoặc móc "
+"đóng “}”."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Chỉ thị số %u kết thúc với một ký tự không hợp lệ, thay vì dấu ngoặc móc đóng “}”."
+msgstr ""
+"Chỉ thị số %u kết thúc với một ký tự không hợp lệ, thay vì dấu ngoặc móc "
+"đóng “}”."
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "Chuỗi bắt đầu ở giữa chỉ thị: “}” mà không có “{” tương ứng."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Chuỗi chứa một “}” lẻ đôi nằm sau chỉ thị số %u."
@@ -578,13 +597,18 @@ msgstr "Trong chỉ thị số %u, không cho phép độ chính xác nằm trư
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "Trong chỉ thị số %u, số đối số cho độ chính xác phải bằng %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước “%c”."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước “%c”."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -621,93 +645,132 @@ msgid "The string ends in the middle of a directive."
 msgstr "Chuỗi kết thúc ở giữa chỉ thị."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "Chuỗi tham chiếu đến đối số bằng cả hai số tuyệt đối và đặc tả đối số không có số."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"Chuỗi tham chiếu đến đối số bằng cả hai số tuyệt đối và đặc tả đối số không "
+"có số."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "Trong chỉ thị số %u, đối số số 0 không phải số nguyên dương."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr "Trong chỉ thị số %u, đối số (số 0) của độ rộng không phải số nguyên dương."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr ""
+"Trong chỉ thị số %u, đối số (số 0) của độ rộng không phải số nguyên dương."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr "Chỉ thị số %u chứa đối số (số 0) của độ chính xác không phải số nguyên dương."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr ""
+"Chỉ thị số %u chứa đối số (số 0) của độ chính xác không phải số nguyên dương."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "Chỉ thị số %u chứa ký tự “%c” không phải đặc tả chuyển đổi hợp lệ."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "Ký tự kết thúc chỉ thi số %u không phải đặc tả chuyển đổi hợp lệ."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Chuỗi tham chiếu đến đối số có số %u bằng nhiều cách không tương thích với nhau."
+msgstr ""
+"Chuỗi tham chiếu đến đối số có số %u bằng nhiều cách không tương thích với "
+"nhau."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "Trong chỉ thị số %u, chuỗi phụ “%s” không thuộc kiểu ngày/giờ hợp lệ."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Trong chỉ thị số %u, “%s” không cho phép dấu phẩy đi theo."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "Trong chỉ thị số %u, chuỗi phụ “%s” không thuộc kiểu con số hợp lệ."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "Trong chỉ thị số %u, số hiệu đối số không cho phép dấu phẩy và một trong số của “%s”, “%s”, “%s”, “%s” theo sau."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"Trong chỉ thị số %u, số hiệu đối số không cho phép dấu phẩy và một trong số "
+"của “%s”, “%s”, “%s”, “%s” theo sau."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "trong chỉ thị số %u, có một lựa chọn không chứa con số."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "Trong chỉ thị số %u, có một lựa chọn chứa con số mà nó không theo sau bởi dấu “<”, “#” hay “%s” theo sau."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"Trong chỉ thị số %u, có một lựa chọn chứa con số mà nó không theo sau bởi "
+"dấu “<”, “#” hay “%s” theo sau."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "đặc tả định dạng cho đối số {%u}, như trong “%s”, không tồn tại trong “%s”"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"đặc tả định dạng cho đối số {%u}, như trong “%s”, không tồn tại trong “%s”"
 
-#: src/format-java.c:757
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "đặc tả định dạng cho đối số {%u} không tồn tại trong “%s”"
 
-#: src/format-java.c:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "đặc tả định dạng trong “%s” và “%s” cho đối số {%u} không phải cùng một thứ"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"đặc tả định dạng trong “%s” và “%s” cho đối số {%u} không phải cùng một thứ"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
-msgstr "Chuỗi này tham chiệu đến đối số có số %u nhưng mà bỏ qua đối số có số %u và %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr ""
+"Chuỗi này tham chiệu đến đối số có số %u nhưng mà bỏ qua đối số có số %u và "
+"%u."
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
-msgstr "một đặc tả định dạng cho tham số %u và %u không tồn tại trong “%s”, chỉ một tham số có thể được bỏ qua"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr ""
+"một đặc tả định dạng cho tham số %u và %u không tồn tại trong “%s”, chỉ một "
+"tham số có thể được bỏ qua"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -718,14 +781,23 @@ msgstr "gặp lỗi khi phân tích: “%s”"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr "Trong chỉ thị số %u, tham số %u có kiểu “%s” nhưng lẽ ra phải có kiểu “%s”."
+msgid ""
+"In the directive number %u, parameter %u is of type '%s' but a parameter of "
+"type '%s' is expected."
+msgstr ""
+"Trong chỉ thị số %u, tham số %u có kiểu “%s” nhưng lẽ ra phải có kiểu “%s”."
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] "Trong chỉ thị số %u có quá nhiều tham số được đưa ra; cần nhiều nhất là %u tham số."
+msgid ""
+"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."
+msgstr[0] ""
+"Trong chỉ thị số %u có quá nhiều tham số được đưa ra; cần nhiều nhất là %u "
+"tham số."
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
@@ -755,8 +827,11 @@ msgstr "Trong chỉ thị số %u, cả hai dấu sửa đổi “@” và “:�
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr "Trong chỉ thị số %u, “~:[” không có hai mệnh đề đi theo, định giớí bằng “~;”."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr ""
+"Trong chỉ thị số %u, “~:[” không có hai mệnh đề đi theo, định giớí bằng “~;”."
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
@@ -765,7 +840,9 @@ msgstr "Trong chỉ thị số %u, “~;” được dùng ở vị trí không
 
 #: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr "Chuỗi tham chiếu đến một đối số nào đó bằng nhiều cách không tương thích với nhau."
+msgstr ""
+"Chuỗi tham chiếu đến một đối số nào đó bằng nhiều cách không tương thích với "
+"nhau."
 
 #: src/format-lisp.c:3477 src/format-scheme.c:3399
 #, c-format
@@ -775,18 +852,23 @@ msgstr "đặc tả định dạng trong “%s” và “%s” không phải tư
 #: src/format-lisp.c:3493 src/format-scheme.c:3415
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "đặc tả định dạng trong “%s” không phải tập hợp con của đặc tả trong “%s”"
+msgstr ""
+"đặc tả định dạng trong “%s” không phải tập hợp con của đặc tả trong “%s”"
 
 #: src/format-perl-brace.c:199 src/format-python-brace.c:442
-#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
+#: src/format-python-brace.c:455 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 "đặc tả định dạng cho đối số “%s” không tồn tại trong “%s”"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "Trong chỉ thị số %u, đặc tả kích cỡ không tương thích với đặc tả chuyển đổi “%c”."
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"Trong chỉ thị số %u, đặc tả kích cỡ không tương thích với đặc tả chuyển đổi "
+"“%c”."
 
 #: src/format-python-brace.c:138
 #, c-format
@@ -796,7 +878,9 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 #: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng một đối số getattr (lấy thuộc tính?)."
+msgstr ""
+"Trong chỉ thị số %u, “%c” không thể bắt đầu bằng một đối số getattr (lấy "
+"thuộc tính?)."
 
 #: src/format-python-brace.c:171
 #, c-format
@@ -805,8 +889,11 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 
 #: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "Trong chỉ thị số %u, không cho phép lồng nhau thêm nữa trong bộ chỉ định định dạng."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"Trong chỉ thị số %u, không cho phép lồng nhau thêm nữa trong bộ chỉ định "
+"định dạng."
 
 #: src/format-python-brace.c:278
 #, c-format
@@ -814,123 +901,155 @@ msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Trong chỉ thị số %u, có một chỉ thị định dạng chưa được kết thúc."
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "Chuỗi tham chiếu đến đối số bằng cả hai tên đối số và đặc tả đối số không tên."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"Chuỗi tham chiếu đến đối số bằng cả hai tên đối số và đặc tả đối số không "
+"tên."
 
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Chuỗi tham chiếu đến đối số tên “%s” bằng nhiều cách không tương thích với nhau."
+msgstr ""
+"Chuỗi tham chiếu đến đối số tên “%s” bằng nhiều cách không tương thích với "
+"nhau."
 
 #: src/format-python.c:430
 #, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "đặc tả định dạng trong “%s” cần một ánh xạ, còn đặc tả trong “%s” cần một tuple (tạm dịch: bản ghi, một dòng dữ liệu)"
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr ""
+"đặc tả định dạng trong “%s” cần một ánh xạ, còn đặc tả trong “%s” cần một "
+"tuple (tạm dịch: bản ghi, một dòng dữ liệu)"
 
 #: src/format-python.c:437
 #, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "đặc tả định dạng trong “%s” cần một tuple (tạm dịch: bản ghi, một dòng dữ liệu), còn đặc tả trong “%s” cần một ánh xạ"
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr ""
+"đặc tả định dạng trong “%s” cần một tuple (tạm dịch: bản ghi, một dòng dữ "
+"liệu), còn đặc tả trong “%s” cần một ánh xạ"
 
-#: src/format-python.c:460 src/format-sh.c:298
+#: 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 '%s'"
-msgstr "đặc tả định dạng cho đối số “%s”, như trong “%s”, không tồn tại trong “%s”"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr ""
+"đặc tả định dạng cho đối số “%s”, như trong “%s”, không tồn tại trong “%s”"
 
 #: src/format-python.c:494
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "đặc tả định dạng trong “%s” và “%s” cho đối số “%s” không phải trùng nhau"
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr ""
+"đặc tả định dạng trong “%s” và “%s” cho đối số “%s” không phải trùng nhau"
 
-#: src/format-qt.c:153
+#: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "“%s” là một chuỗi định dạng đơn giản, nhưng “%s” không phải: nó chứa một cờ “L” hay một số kiểu đối số chữ-số-kép"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"“%s” là một chuỗi định dạng đơn giản, nhưng “%s” không phải: nó chứa một cờ "
+"“L” hay một số kiểu đối số chữ-số-kép"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Chuỗi tham chiếu đến một biến hệ vỏ có tên khác ASCII."
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "Chuỗi tham chiếu đến một biến hệ vỏ có cú pháp dấu ngoặc hệ vỏ phức tạp. Ở đây không hỗ trợ cú pháp đó bởi vì lý do bảo mật."
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"Chuỗi tham chiếu đến một biến hệ vỏ có cú pháp dấu ngoặc hệ vỏ phức tạp. Ở "
+"đây không hỗ trợ cú pháp đó bởi vì lý do bảo mật."
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr "Chuỗi tham chiếu đến biến hệ vỏ có giá trị có thể khác trong hàm trình bao."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"Chuỗi tham chiếu đến biến hệ vỏ có giá trị có thể khác trong hàm trình bao."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Chuỗi tham chiếu đến biến hệ vỏ có tên rỗng."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "Trong chỉ thị số %u, ký tự “%c” không phải chữ số nằm giữa 1 và 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
+msgid ""
+"The character that terminates the directive number %u is not a digit between "
+"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."
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "quá nhiều đối số"
 
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Cách dùng: %s [TÙY CHỌN]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "In ra tên máy của máy tính này.\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Định dạng xuất ra:\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 tên máy ngắn\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr ""
 "  -f, --fqdn, --long          tên máy dài, gồm tên miền đầy đủ,\n"
 "                                và biệt hiệu\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 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:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
-#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
 #, c-format
 msgid "could not get host name"
 msgstr "không thể lấy tên máy"
@@ -940,7 +1059,7 @@ msgstr "không thể lấy tên máy"
 msgid "selector is not specified"
 msgstr "chưa chỉ định bộ chọn"
 
-#: src/its.c:326 src/its.c:1550
+#: src/its.c:326 src/its.c:1635
 #, c-format
 msgid "cannot create XPath context"
 msgstr "không thể tạo ngữ cảnh XPath"
@@ -950,28 +1069,28 @@ msgstr "không thể tạo ngữ cảnh XPath"
 msgid "cannot evaluate XPath expression: %s"
 msgstr "không thể lượng giá biểu thức XPath: %s"
 
-#: src/its.c:614
+#: src/its.c:695
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
 msgstr "nút \"%s\" không chứa \"%s\""
 
-#: src/its.c:1001
+#: src/its.c:1086
 #, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
 msgstr "giá trị thuộc tính không hợp lệ “%s” cho “%s”"
 
-#: src/its.c:1333
+#: src/its.c:1418
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr "phần tử gốc không \"quy tắc\" dưới không gian tên %s"
 
-#: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
 #: src/locating-rule.c:170
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "không thể đọc %s: %s"
 
-#: src/its.c:1573
+#: src/its.c:1658
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
 msgstr "không thể lượng giá đường dẫn vị trí XPath: %s"
@@ -991,28 +1110,28 @@ msgstr "không thể đọc tin XML “%s”"
 msgid "the root element is not \"locatingRules\""
 msgstr "phần tử gốc không phải là \"locatingRules\""
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cho phép nhiều nhất một tập tin đầu vào"
 
-#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
-#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
-#: src/xgettext.c:710 src/xgettext.c:734
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s và %s loại từ lẫn nhau"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN_ĐẦU_VÀO]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1021,62 +1140,67 @@ msgstr ""
 "Lọc các chuỗi 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:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Tất cả đối số bắt buộc phải có với tùy chọn dài cũng bắt buộc với tùy chọn ngắn.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Tất cả đối số bắt buộc phải có 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:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "Vị trí tập tin đầu vào:\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin PO đầu vào\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1056
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=THƯ_MỤC     thêm THƯ MỤC này vào danh sách để tìm kiếm\n"
 "                              tập tin đầu vào\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, 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 đầu vào, hay nó là “-” thì đọc đầu vào tiêu chuẩn.\n"
+msgstr ""
+"Không đưa ra tập tin đầu vào, hay nó là “-” thì đọc đầu vào tiêu chuẩn.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1061
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "Vị trí tập tin đầu ra:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
-#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
-#: src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, 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:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1085,282 +1209,318 @@ msgstr ""
 "Kết quả được ghi ra đầu ra tiêu chuẩn nếu không chỉ ra tập tin kết xuất,\n"
 "hoặc nếu nó là “-”.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "Chọn chuỗi:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
-msgstr "      --translated            giữ các chuỗi đã dịch, bỏ các chuỗi chưa dịch\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
+msgstr ""
+"      --translated            giữ các chuỗi đã dịch, bỏ các chuỗi chưa dịch\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          giữ các chuỗi chưa dịch,\n"
 "                              bỏ các chuỗi đã dịch\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
 "                               (tạm dịch), các chuỗi này trở thành đã dịch\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            giữ các chuỗi được đánh dấu là “fuzzy”\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           loại bỏ các chuỗi đã cũ (có dấu #~)\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         giữ các chuỗi đã cũ (có dấu #~)\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Thao tác với các thuộc tính:\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             đặt mọi chuỗi là “fuzzy” (tạm dịch)\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           đặt mọi chuỗi là không-“fuzzy” (tạm dịch)\n"
+msgstr ""
+"      --clear-fuzzy           đặt mọi chuỗi là không-“fuzzy” (tạm dịch)\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          đặt mọi chuỗi là cũ không dùng nữa\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        đặt mọi chuỗi là chưa quá cũ\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous              khi đặt “fuzzy” thì giữ lại các chuỗi gốc msgid\n"
+"      --previous              khi đặt “fuzzy” thì giữ lại các chuỗi gốc "
+"msgid\n"
 "                              của chuỗi đã dịch\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-previous        lại bỏ “previous msgid” ra khỏi mọi chuỗi\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        lại bỏ “previous msgid” ra khỏi mọi chuỗi\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr ""
-"      --empty                 khi loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
+"      --empty                 khi loại bỏ các chuỗi được đánh dấu là "
+"“fuzzy”\n"
 "                               (tạm dịch), xóa trống chuỗi này\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=TẬP_TIN.po  thao tác chỉ những mục được liệt kê trong\n"
 "                               tập tin này\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=T_TIN.po  thao tác chỉ những mục không được liệt kê\n"
 "                               trong tập tin này\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr "      --fuzzy                 tương đương với “--only-fuzzy --clear-fuzzy”\n"
+msgstr ""
+"      --fuzzy                 tương đương với “--only-fuzzy --clear-fuzzy”\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr "      --obsolete              tương đương với “--only-obsolete --clear-obsolete”\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr ""
+"      --obsolete              tương đương với “--only-obsolete --clear-"
+"obsolete”\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Cú pháp tập tin đầu vào:\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      tập tin đầu vào có cú pháp .properties\n"
 "                              (thuộc tính) của Java\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
 msgstr ""
 "      --stringtable-input     tập tin đầu vào có cú pháp .strings kiểu\n"
 "                              NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1162
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "Chi tiết kết xuất:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 luôn luôn đặt màu sắc và các thuộc tính văn\n"
 "                              bản khác\n"
-"      --color=KHI             dùng màu sắc và các thuộc tính khác cho văn bản\n"
+"      --color=KHI             dùng màu sắc và các thuộc tính khác cho văn "
+"bản\n"
 "                              KHI nào:\n"
 "                                 * always     luôn luôn\n"
 "                                 * never      không bao giờ\n"
 "                                 * auto       tự động\n"
 "                                 * html       HTML.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=TẬP_TIN         chỉ định tập tin quy tắc kiểu dáng CSS cho\n"
 "                              --color (màu)\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1170
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr "  -e, --no-escape             không dùng ký tự thoát C trong kết xuất (mặc định)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             không dùng ký tự thoát C trong kết xuất (mặc "
+"định)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1172
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                dùng ký tự thoát C trong kết xuất,\n"
 "                              không dùng ký tự mở rộng\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              ghi ra tập tin PO ngay cả khi nó trống rỗng\n"
+msgstr ""
+"      --force-po              ghi ra tập tin PO ngay cả khi nó trống rỗng\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
-#: src/xgettext.c:1176
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                ghi ra tập tin PO có thụt lề\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
-#: src/xgettext.c:1178
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           không ghi dòng kiểu “#: tên_tập_tin:số_hiệu_dòng”\n"
+msgstr ""
+"      --no-location           không ghi dòng kiểu “#: tên_tập_tin:"
+"số_hiệu_dòng”\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
-#: src/xgettext.c:1180
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          tạo ra dòng kiểu “#: tên_tập_tin:số_hiệu_dòng”\n"
+"  -n, --add-location          tạo ra dòng kiểu “#: tên_tập_tin:"
+"số_hiệu_dòng”\n"
 "                              (mặc định)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
-#: src/xgettext.c:1182
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                xuất tập tin PO tùy theo Uniforum chính xác\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                xuất tập tin PO tùy theo Uniforum chính xác\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     xuất tập tin .properties (thuộc tính) kiểu Java\n"
+msgstr ""
+"  -p, --properties-output     xuất tập tin .properties (thuộc tính) kiểu "
+"Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    ghi ra tập tin .strings (chuỗi)\n"
 "                              kiểu NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SỐ              đặt chiều rộng của trang kết xuất\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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               không ngắt ra nhiều dòng cho những dòng dài hơn\n"
+"      --no-wrap               không ngắt ra nhiều dòng cho những dòng dài "
+"hơn\n"
 "                              chiều rộng trang kết xuất\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1195
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           tạo ra kết xuất được sắp xếp\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1197
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, 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"
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "xác định tiêu chuẩn lựa chọn không thể sử dụng được (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN_ĐẦU_VÀO]…\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1385,23 +1545,25 @@ msgstr ""
 "chúng sẽ được lấy từ tập tin PO thứ nhất có chuỗi được dịch.\n"
 "Vị trí tập tin từ mọi tập tin PO sẽ được tích lũy.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  TẬP_TIN_ĐẦU_VÀO …           những tập tin đầu vào\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=TẬP_TIN    lấy từ tập tin này danh sách các tập tin đầu vào\n"
+msgstr ""
+"  -f, --files-from=TẬP_TIN    lấy từ tập tin này danh sách các tập tin đầu "
+"vào\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
-#: src/xgettext.c:1058
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Nếu tập tin đầu vào là “-” thì đọc từ đầu vào tiêu chuẩn.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1410,7 +1572,7 @@ msgstr ""
 "  -<, --less-than=SỐ          in ra các chuỗi có ít hơn SỐ các lời\n"
 "                              định nghĩa; không bật thì mặc định là vô hạn\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1419,25 +1581,27 @@ msgstr ""
 "  ->, --more-than=SỐ          in ra các chuỗi có nhiều hơn SỐ các lời\n"
 "                              định nghĩa; không bật thì mặc định là 0\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: 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 ""
-"  -u, --unique                dạng viết tắt cho tùy chọn “--less-than=2” (ít hơn 2),\n"
+"  -u, --unique                dạng viết tắt cho tùy chọn “--less-than=2” (ít "
+"hơn 2),\n"
 "                              yêu cầu in ra chỉ những chuỗi duy nhất\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      tập tin đầu vào có cú pháp kiểu .properties\n"
 "                              (thuộc tính) của Java\n"
 
-#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1446,12 +1610,12 @@ msgstr ""
 "      --stringtable-input     tập tin đầu vào có cú pháp .strings (chuỗi)\n"
 "                              kiểu NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=MÃ            bộ ký tự cho kết xuất\n"
 
-#: src/msgcat.c:430 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1460,33 +1624,36 @@ msgstr ""
 "      --use-first             dùng bản dịch đầu tiên cho mỗi chuỗi,\n"
 "                              không trộn nhiều bản dịch\n"
 
-#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr "      --lang=TÊN_PHÂN_LOẠI    đặt trường “Language” (Ngôn ngữ) trong phần đầu\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=TÊN_PHÂN_LOẠI    đặt trường “Language” (Ngôn ngữ) trong phần "
+"đầ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:179 src/msgcomm.c:291 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "chưa đưa ra tập tin đầu vào"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cần chính xác 2 tập tin đầu vào"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1504,83 +1671,87 @@ msgstr ""
 "của bạn. Vị trí nào không khớp với nhau, còn chưa xong để cung cấp sự chẩn đoán\n"
 "tốt hơn.\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  cũ.po                       bản dịch cũ\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  mới.pot                     các nguồn dùng để tham chiếu\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Sửa đổi thao tác:\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          áp dụng tập tin mới.pot vào mỗi miền nằm trong tập tin cũ.po\n"
+msgid ""
+"  -m, --multi-domain          apply ref.pot to each of the domains in def."
+"po\n"
+msgstr ""
+"  -m, --multi-domain          áp dụng tập tin mới.pot vào mỗi miền nằm trong "
+"tập tin cũ.po\n"
 
-#: src/msgcmp.c:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     không dùng khả năng khớp mờ (fuzzy)\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             dùng các mục tạm dịch\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      dùng các mục chưa dịch\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "chuỗi này chưa được dịch"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "chuỗi này cần phải được xem xét lại bởi dịch giả"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "chuỗi này được dùng nhưng còn chưa được định nghĩa…"
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "…nhưng mà định nghĩa này vẫn tương tự"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "cảnh báo: chuỗi này không được dùng"
 
-#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "phải chỉ ra ít nhất hai tập tin"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1601,7 +1772,7 @@ msgstr ""
 "trích sẽ được bảo tồn, nhưng chỉ từ tập tin PO thứ nhất đã định nghĩa chúng.\n"
 "Vị trí tập tin từ mọi tập tin PO này sẽ được tích lũy.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1610,65 +1781,71 @@ msgstr ""
 "  ->, --more-than=SỐ          in các chuỗi chứa nhiều định nghĩa hơn\n"
 "                              SỐ này; không bật thì mặc định là 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1199
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           không ghi dòng đầu có mục tin “msgid \"\"” \n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr ""
+"      --omit-header           không ghi dòng đầu có mục tin “msgid \"\"” \n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, 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ột bảng mã ký tự khác.\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Đích chuyển đổi:\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Mã ký tự mặc định theo bảng mã ký tự của miền địa phương hiện có.\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                thụt lề cho kết xuất\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           thu hồi dòng kiểu “#: tên_tập_tin:số_dòng”\n"
+msgstr ""
+"      --no-location           thu hồi dòng kiểu “#: tên_tập_tin:số_dòng”\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          giữ lại dòng “#: tên_tập_tin:số_dòng” (mặc định)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          giữ lại dòng “#: tên_tập_tin:số_dòng” (mặc "
+"định)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                xuất dữ liệu kiểu Uniforum chính xác\n"
 
-#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "chưa đưa ra tập tin đầu vào"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "cần chính xác một tập tin đầu vào"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] TẬP_TIN_ĐẦU_VÀO\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1681,22 +1858,22 @@ msgstr ""
 "(POT: thường do xgettext tạo). Mục chưa dịch sẽ được gán\n"
 "bằng chuỗi gốc (msgid).\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin đầu vào dạng .po hay .pot\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "thiếu tên lệnh"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] LỆNH [TÙY_CHỌN_LỆNH]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1711,7 +1888,7 @@ msgstr ""
 "Kết xuất của nó trở thành kết xuất của tiến trình msgexec.\n"
 "Mã trả lại của megexec là mã trả lại tối đa qua mọi cuộc gọi.\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1721,61 +1898,63 @@ msgstr ""
 "với một byte null theo sau. Kết xuất của tiến trình “msgexec 0”\n"
 "thích hợp là đầu vào cho lệnh “xargs -0”.\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "Lệnh đầu vào:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  --newline                   thêm ký tự dòng mới tại cuối của đầu vào\n"
+msgstr ""
+"  --newline                   thêm ký tự dòng mới tại cuối của đầu vào\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin .po đầu vào\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "gặp lỗi khi ghi vào đầu ra tiêu chuẩn"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "thiếu tên bộ lọc"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "phải đưa ra ít nhất một văn lệnh sed"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Áp dụng một bộ lọc cho mọi chuỗi dịch của một catalog bản dịch.\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, 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 ""
-"BỘ LỌC có thể là bất cứ chương trình nào đọc chuỗi dịch từ đầu vào tiêu chuẩn\n"
+"BỘ LỌC có thể là bất cứ chương trình nào đọc chuỗi dịch từ đầu vào tiêu "
+"chuẩn\n"
 "và ghi chuỗi dịch đã sửa đổi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Bộ lọc đầu vào và đầu ra:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1784,249 +1963,282 @@ msgstr ""
 "  --newline                   thêm ký hiệu dòng mới vào cuối đầu vào\n"
 "                                và gỡ bỏ ký hiệu dòng mới ở cuối đầu ra"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, 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:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=VĂN_LỆNH    thêm văn lệnh này vào những lệnh cần thực hiện\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr ""
+"  -e, --expression=VĂN_LỆNH    thêm văn lệnh này vào những lệnh cần thực "
+"hiện\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
 "  -f, --file=TẬP_TIN_VĂN_LỆNH\n"
 "                              thêm nội dung của TẬP TIN VĂN LỆNH này\n"
 "                              vào những lệnh cần thực hiện\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+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\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             không dùng ký tự thoát C trong kết xuất\n"
 "                              (mặc định)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                kiểu dáng kết xuất đã thụt lề\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           giữ lại phần đầu không bị sửa đổi, không lọc nó\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr ""
+"      --keep-header           giữ lại phần đầu không bị sửa đổi, không lọc "
+"nó\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "đầu ra bộ lọc không được kết thúc bằng một ký hiệu dòng mới"
 
-#: src/msgfmt.c:374
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "đối số cho “%s” nên là một ký tự chấm câu riêng lẻ"
 
-#: src/msgfmt.c:421
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "thứ tự xếp các byte (biểu diễn số nguyên) 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:452 src/msgunfmt.c:269 src/xgettext.c:687
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:473
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "không đưa ra tập tin đầu vào nếu “%s” và “%s” được chỉ định"
 
-#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s cần một đặc tả “-d directory” (thư mục)"
 
-#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
-#: src/msgunfmt.c:324 src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s cần một đặc tả “-l locale” (miền địa phương)"
 
-#: src/msgfmt.c:573 src/msgfmt.c:601
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s cần một đặc tả “--template template”"
 
-#: src/msgfmt.c:580 src/msgfmt.c:608
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s cần một đặc tả “-o tập-tin”"
 
-#: src/msgfmt.c:586 src/msgfmt.c:614
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s và %s loại từ lẫn nhau trong %s"
 
-#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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"
 
-#: src/msgfmt.c:634 src/msgfmt.c:640
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s chỉ hợp lệ với %s, %s hay %s"
 
-#: src/msgfmt.c:713
+#: src/msgfmt.c:711
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "không thể định vị quy tắc ITS cho “%s”"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:874
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d chuỗi đã dịch"
 
-#: src/msgfmt.c:883
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d chuỗi tạm dịch"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d chuỗi chưa dịch"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] tên_tập_tin.po …\n"
 
-#: src/msgfmt.c:912
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Tạo ra catalog bản dịch nhị phân từ mô tả thông dịch kiểu văn bản.\n"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tên_tập_tin.po …            những tập tin đầu vào\n"
 
-#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
 
-#: src/msgfmt.c:933
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  chế độ Java: tạo ra lớp ResourceBundle\n"
 "                               (bó tài nguyên) kiểu Java\n"
 
-#: src/msgfmt.c:935
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 "      --java2                 giống như --java, và coi là Java2\n"
 "                               (JDK 1.2 hay sau)\n"
 
-#: src/msgfmt.c:937
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                chế độ C#: tạo ra một tập tin .dll kiểu .NET\n"
+msgstr ""
+"      --csharp                chế độ C#: tạo ra một tập tin .dll kiểu .NET\n"
 
-#: src/msgfmt.c:939
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr ""
-"      --csharp-resources      chế độ tài nguyên C#: tạo ra một tập tin .resources\n"
+"      --csharp-resources      chế độ tài nguyên C#: tạo ra một tập tin ."
+"resources\n"
 "                              (tài nguyên) kiểu .NET\n"
 
-#: src/msgfmt.c:941
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/"
+"msgcat\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    chế độ Qt: tạo ra một tập tin .qm kiểu Qt\n"
+msgstr ""
+"      --qt                    chế độ Qt: tạo ra một tập tin .qm kiểu Qt\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --desktop               chế độ Desktop Entry: tạo một tập tin .desktop\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+"      --desktop               chế độ Desktop Entry: tạo một tập tin ."
+"desktop\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:945
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   chế độ XML: tạo tập tin XML\n"
 
-#: src/msgfmt.c:954
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                bật chế độ Uniforum chính xác (chặt chẽ)\n"
+msgstr ""
+"      --strict                bật chế độ Uniforum chính xác (chặt chẽ)\n"
 
-#: src/msgfmt.c:956 src/xgettext.c:1069
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Nếu tập tin xuất là “-” thì kết xuất được ghi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msgfmt.c:959
+#: src/msgfmt.c:957
 #, c-format
 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:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=TÀI_NGUYÊN   tên của tài nguyên\n"
 
-#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
-#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
 "  -l, --locale=MIỀN_ĐỊA_PHƯƠNG tên miền địa phương, hoặc ngôn ngữ hoặc\n"
 "                              ngôn-ngữ_quốc-gia (v.d. “vi” hay “vi_VN”)\n"
 
-#: src/msgfmt.c:965
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
-msgstr "      --source                sản sinh tập tin .java, thay cho tập tin .class\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+"      --source                sản sinh tập tin .java, thay cho tập tin ."
+"class\n"
 
-#: src/msgfmt.c:967
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d THƯ_MỤC                  thư mục cơ sở của phân cấp thư mục lớp\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
@@ -2034,19 +2246,21 @@ msgstr ""
 "vào tên tài nguyên, định giới bằng dấu gạch dưới. Tùy chọn “-d” bắt buộc\n"
 "phải sử dụng. Lớp được ghi dưới thư mục đã chỉ ra.\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:973
 #, c-format
 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:981 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr ""
 "  -d THƯ_MỤC                  thư mục cơ sở cho tập tin dạng .dll\n"
 "                              phụ thuộc vào miền địa phương\n"
 
-#: src/msgfmt.c:983
+#: src/msgfmt.c:981
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2056,17 +2270,18 @@ msgstr ""
 "Tập tin .dll được ghi trong thư mục con của thư mục đã đưa ra\n"
 "có tên phụ thuộc vào miền địa phương.\n"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:985
 #, c-format
 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:991 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d THƯ_MỤC                  thư mục cơ sở của catalog bản dịch dạng .msg\n"
+msgstr ""
+"  -d THƯ_MỤC                  thư mục cơ sở của catalog bản dịch dạng .msg\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2075,22 +2290,22 @@ 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 đã cho.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Các tùy chọn dành cho chế độ Desktop Entry:\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=MẪU              tập tin .desktop được dùng làm mẫu\n"
 
-#: src/msgfmt.c:1005 src/msgfmt.c:1024
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d THƯ_MỤC                  thư mục cơ sở của tập tin .po\n"
 
-#: src/msgfmt.c:1007 src/xgettext.c:1123
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2099,59 +2314,65 @@ msgstr ""
 "  -kTỪ, --keyword=TỪ          quét tìm TỪ này như là một từ khóa bổ sung\n"
 "  -k, --keyword               không dùng từ khóa mặc định\n"
 
-#: src/msgfmt.c:1010 src/msgfmt.c:1026
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
-"Các tùy chọn -l, -o, và --template là bắt buộc.  Nếu chỉ ra tùy chọn -D, tập tin\n"
+"Các tùy chọn -l, -o, và --template là bắt buộc.  Nếu chỉ ra tùy chọn -D, tập "
+"tin\n"
 "đầu vào sẽ đọc từ thư mục thay cho đối số dòng lệnh.\n"
 
-#: src/msgfmt.c:1014
+#: src/msgfmt.c:1012
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Các tùy chọn XML:\n"
 
-#: src/msgfmt.c:1018
+#: src/msgfmt.c:1016
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=TÊN          thừ nhận ngôn ngữ XML đã cho\n"
 
-#: src/msgfmt.c:1022
+#: src/msgfmt.c:1020
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=MẪU              một tập tin XML được dùng làm mẫu\n"
 
-#: src/msgfmt.c:1038 src/xgettext.c:1086
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Giải thích tập tin đầu vào:\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 thực hiện mọi kiểm tra kiểu:\n"
 "                                   --check-format (kiểm tra định dạng)\n"
 "                                   --check-header (kiểm tra phần đầu)\n"
 "                                   --check-domain (kiểm tra miền)\n"
 
-#: src/msgfmt.c:1043
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kiểm tra các chuỗi có định dạng\n"
 "                              phụ thuộc vào ngôn ngữ\n"
 
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
-msgstr "      --check-header          kiểm tra xem mục tin phần đầu có đúng không\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
+msgstr ""
+"      --check-header          kiểm tra xem mục tin phần đầu có đúng không\n"
 
-#: src/msgfmt.c:1047
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2160,134 +2381,141 @@ msgstr ""
 "      --check-domain          kiểm tra nếu có sự xung đột giữa chỉ thị miền\n"
 "                              và tùy chọn “--output-file” (tập tin xuất)\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
 msgstr ""
 "  -C, --check-compatibility   kiểm tra msgfmt của GNU ứng xử\n"
 "                              giống như msgfmt của X/Open\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
 msgstr ""
 "      --check-accelerators[=K.TỰ] kiểm tra có ký tự tăng tốc bàn phím\n"
 "                              cho mục trình đơn\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             dùng mục tin tạm dịch trong kết xuất\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=SỐ          căn chỉnh các chuỗi theo số byte này (mặc định: %d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=SỐ          căn chỉnh các chuỗi theo số byte này (mặc "
+"định: %d)\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=THỨ_TỰ_BYTE ghi ra số 32-bit theo thứ tự đã cho\n"
-"                                (big hay little, mặc định phụ thuộc vào máy tính đang dùng)\n"
-"                                (byte đứng trước là lớn hay nhỏ. Intel thường là little)\n"
+"                                (big hay little, mặc định phụ thuộc vào máy "
+"tính đang dùng)\n"
+"                                (byte đứng trước là lớn hay nhỏ. Intel "
+"thường là little)\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               tập tin nhị phân sẽ không chứa bảng băm\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr ""
+"      --no-hash               tập tin nhị phân sẽ không chứa bảng băm\n"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            in ra thống kê về các chuỗi dịch\n"
 
-#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               gia tăng mức chi tiết\n"
 
-#: src/msgfmt.c:1189
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "cảnh báo: phần đầu của tập tin .po còn thiếu hay không hợp lệ\n"
 
-#: src/msgfmt.c:1192
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "cảnh báo: việc chuyển đổi bộ ký tự sẽ không hoạt động được\n"
 
-#: src/msgfmt.c:1202
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
-
-#: src/msgfmt.c:1204
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "cảnh báo: phiên bản msgfmt cũ hơn sẽ thông báo lỗi trong trường hợp này.\n"
-
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "tên miền “%s” không thích hợp làm tên tập tin"
 
-#: src/msgfmt.c:1233
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "tên miền “%s” không thích hợp làm tên tập tin: nên sẽ dùng tiền tố"
 
-#: src/msgfmt.c:1247
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "chỉ thị “domain %s” bị bỏ qua"
 
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "mục tin “msgstr” rỗng bị bỏ qua"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "chuỗi “msgstr” tạm dịch bị bỏ qua"
 
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: cảnh báo: tập tin nguồn chứa chuỗi tạm dịch"
 
-#: src/msgfmt.c:1474
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s không tồn tại"
 
-#: src/msgfmt.c:1481
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "có %s nhưng không thể đọc nó"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
 #: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
-#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "gặp lỗi khi đọc “%s”"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
-msgstr "tùy chọn “%c” không thể được dùng trước chỉ ra “J” hay “K” hay “T” hay “C” hay “X”"
+msgid ""
+"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
+"specified"
+msgstr ""
+"tùy chọn “%c” không thể được dùng trước chỉ ra “J” hay “K” hay “T” hay “C” "
+"hay “X”"
 
-#: src/msggrep.c:522
+#: src/msggrep.c:521
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2296,7 +2524,7 @@ msgstr ""
 "Trích ra mọi chuỗi trong catalog bản 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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2379,35 +2607,43 @@ msgstr ""
 "  -v, --invert-match\n"
 "\txuất chỉ những chuỗi không khớp với tiêu chuẩn lựa chọn nào\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                dùng ký tự thoát dạng C trong kết xuất,\n"
 "                              không có ký tự đã mở rộng\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tạo ra kết xuất được sắp xếp\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          sắp xếp kết xuất theo vị trí của tập tin\n"
+msgstr ""
+"      --sort-by-file          sắp xếp kết xuất theo vị trí của tập tin\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "Hiện thời biến ngôn ngữ của môi trường chưa xác định.\n"
 "Hãy đặt biến môi trường LANG (ngôn ngữ), như được diễn tả trong tập tin\n"
 "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:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2418,12 +2654,12 @@ msgstr ""
 "Hãy đưa ra miền địa phương bằng tùy chọn “--locale”\n"
 "hoặc đưa ra tập tin PO xuất bằng tùy chọn “--output-file”\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "Đã tạo %s.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2432,26 +2668,28 @@ 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin dạng POT đầu vào\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"Không đưa ra tập tin đầu vào thì thư mục hiện thời được quét tìm tập tin POT.\n"
+"Không đưa ra tập tin đầu vào thì thư mục hiện thời được quét tìm tập tin "
+"POT.\n"
 "Tập tin đầu vào là “-” thì đọc đầu vào tiêu chuẩn.\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, 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"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2461,17 +2699,19 @@ msgstr ""
 "(miền địa phương) hoặc vào thiết lập miền địa phương của người dùng.\n"
 "Nếu tập tin xuất là “-” thì kết quả được ghi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=NN_QQ          đặt miền địa phương đích (v.d. vi_VN)\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         coi là tập tin PO được tự động tạo ra\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2479,12 +2719,12 @@ msgstr ""
 "Tìm thấy nhiều tập tin dạng .pot.\n"
 "Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input” (đầu vào)\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "gặp lỗi khi đọc thư mục hiện thời"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2492,64 +2732,71 @@ msgstr ""
 "Không tìm thấy tập tin dạng .pot trong thư mục hiện thời.\n"
 "Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input”\n"
 
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/msginit.c:1418 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "tiến trình con %s bị lỗi với mã thoát %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "Catalog bản dịch mới nên chứa địa chỉ thư điện tử của bạn,\n"
 "để người dùng gửi cho bạn thông tin phản hồi về bản dịch,\n"
-"cũng giúp cho nhà duy trì liên lạc trong trường hợp gặp lỗi kỹ thuật bất thường.\n"
+"cũng giúp cho nhà duy trì liên lạc trong trường hợp gặp lỗi kỹ thuật bất "
+"thường.\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1615
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "Bản dịch Tiếng Việt dành cho gói %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "bộ ký tự hiện có “%s” không phải tên bộ ký tự khả chuyển"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "tập tin đầu vào chứa hai bộ ký tự khác nhau “%s” và “%s”"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "tập tin đầu vào “%s” không chứa mục tin phần đầu xác định bộ ký tự"
 
-#: src/msgl-cat.c:208
+#: 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 "miền “%s” trong tập tin đầu vào “%s” không chứa trường xác định bộ ký tự"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr ""
+"miền “%s” trong tập tin đầu vào “%s” không chứa trường xác định bộ ký tự"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "bộ ký tự đích “%s” không phải tên bảng mã khả chuyển."
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:579 src/xgettext.c:3729
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "cảnh báo: "
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2558,18 +2805,21 @@ msgstr ""
 "Những tập tin đầu vào chứa chuỗi ở các bảng mã ký tự khác nhau, gồm UTF-8,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Những tập tin đầu vào chứa chuỗi ở các bảng mã ký tự khác nhau, gồm %s và %s,\n"
+"Những tập tin đầu vào chứa chuỗi ở các bảng mã ký tự khác nhau, gồm %s và "
+"%s,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
-"Chọn bảng mã ký tự để xuất ra khác, hãy dùng tùy chọn “--to-code” (sang mã).\n"
+"Chọn bảng mã ký tự để xuất ra khác, hãy dùng tùy chọn “--to-code” (sang "
+"mã).\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2583,7 +2833,7 @@ msgstr ""
 "sang bảng mã ký tự ASCII, hoặc đảm bảo chúng được mã hóa bằng UTF-8 từ đầu,\n"
 "tức là trong các tập tin mã nguồn.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2596,12 +2846,12 @@ msgstr ""
 "Kết xuất của “%s” có thể không đúng.\n"
 "Chỉnh sửa có thể:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2612,7 +2862,7 @@ msgstr ""
 "  rồi áp dụng “%s”,\n"
 "  rồi chuyển đổi lại về %s bằng “msgconv”.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2625,7 +2875,7 @@ msgstr ""
 "  rồi áp dụng “%s”,\n"
 "  rồi chuyển đổi lại về %s bằng “msgconv”.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2654,8 +2904,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "dạng thức số nhiều có thể gây ra trường hợp tràn số nguyên"
 
 #: src/msgl-check.c:201
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "dạng thức số nhiều có thể gây ra trường hợp ngoại lệ tính toán, có lẽ chia cho số không"
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr ""
+"dạng thức số nhiều có thể gây ra trường hợp ngoại lệ tính toán, có lẽ chia "
+"cho số không"
 
 #: src/msgl-check.c:270
 #, c-format
@@ -2668,11 +2922,15 @@ msgstr "catalog bản dịch chứa bản dịch dạng số nhiều"
 
 #: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều “plural=BIỂU_THỨC”"
+msgstr ""
+"nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều "
+"“plural=BIỂU_THỨC”"
 
 #: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều “plural=SỐ_NGUYÊN”"
+msgstr ""
+"nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều "
+"“plural=SỐ_NGUYÊN”"
 
 #: src/msgl-check.c:424
 msgid "invalid nplurals value"
@@ -2701,14 +2959,17 @@ msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "nhưng một số chuỗi có %lu dạng số nhiều"
 
 #: src/msgl-check.c:518
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"catalog bản dịch chứa chuỗi dịch ở số nhiều, nhưng còn thiếu mục tin phần đầu chứa dòng\n"
+"catalog bản dịch chứa chuỗi dịch ở số nhiều, nhưng còn thiếu mục tin phần "
+"đầu chứa dòng\n"
 "\"Plural-Forms: nplurals=SỐ_NGUYÊN; plural=BIỂU_THỨC\"\n"
 "Với tiếng Việt, bạn có thể dùng:\n"
 "\"Plural-Forms: nplurals=1; plural=0;\""
 
-#: src/msgl-check.c:615
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không bắt đầu với “\\n”"
 
@@ -2717,11 +2978,11 @@ msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không bắ
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgstr[%u]” đều không bắt đầu với “\\n”"
 
-#: src/msgl-check.c:638
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgstr” đều không bắt đầu với “\\n”"
 
-#: src/msgl-check.c:656
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không kết thúc với “\\n”"
 
@@ -2730,13 +2991,15 @@ msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không kế
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgstr[%u]” đều không kết thúc với “\\n”"
 
-#: src/msgl-check.c:679
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid” và “msgstr” đều không kết thúc với “\\n”"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
-msgstr "khả năng xử lý dạng thức số nhiều là một phần mở rộng của phần mềm gettext của GNU"
+msgstr ""
+"khả năng xử lý dạng thức số nhiều là một phần mở rộng của phần mềm gettext "
+"của GNU"
 
 #: src/msgl-check.c:733
 #, c-format
@@ -2764,17 +3027,19 @@ msgstr "chấm lửng hóa ('...') thay cho Unicode"
 
 #: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr "tìm thấy khoảng trắng trước phần chấm lửng trong các chuỗi người dùng khả kiến"
+msgstr ""
+"tìm thấy khoảng trắng trước phần chấm lửng trong các chuỗi người dùng khả "
+"kiến"
 
-#: src/msgl-check.c:1042
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Trích dẫn dấu nháy kép ASCII thay cho Unicode"
 
-#: src/msgl-check.c:1048
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Trích dẫn dấu nháy đơn ASCII thay cho Unicode"
 
-#: src/msgl-check.c:1163
+#: src/msgl-check.c:1162
 #, c-format
 msgid "ASCII bullet ('%c') instead of Unicode"
 msgstr "Chấm ASCII (“%c”) thay cho Unicode"
@@ -2787,39 +3052,52 @@ msgstr "%s: đầu vào ở bảng mã ký tự “%s” không hợp lệ"
 #: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: gặp lỗi khi chuyển đổi từ bảng mã ký tự “%s” sang bảng mã ký tự “%s”"
+msgstr ""
+"%s: gặp lỗi khi chuyển đổi từ bảng mã ký tự “%s” sang bảng mã ký tự “%s”"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "tập tin đầu vào không chứa mục tin phần đầu xác định bộ ký tự"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:800 src/x-python.c:665
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "Không thể chuyển đổi từ “%s” sang “%s”. %s phụ thuộc vào iconv() mà không hỗ trợ khả năng chuyển đổi này."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"Không thể chuyển đổi từ “%s” sang “%s”. %s phụ thuộc vào iconv() mà không hỗ "
+"trợ khả năng chuyển đổi này."
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "Việc chuyển đổi từ “%s” sang “%s” giới thiệu một số bản sao: một số chuỗi gốc “msgid” thì trở thành trùng."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Việc chuyển đổi từ “%s” sang “%s” giới thiệu một số bản sao: một số chuỗi "
+"gốc “msgid” thì trở thành trùng."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
-#: src/x-python.c:672
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-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()."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
+"built without iconv()."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s chỉ hợp lệ với %s"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "kiểu sao lưu"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2843,26 +3121,27 @@ 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:521
+#: src/msgmerge.c:562
 #, 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:523
+#: src/msgmerge.c:564
 #, 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:527
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=TẬP_TIN    tập hợp chuỗi dịch thêm, cũng có thể được xác định\n"
+"  -C, --compendium=TẬP_TIN    tập hợp chuỗi dịch thêm, cũng có thể được xác "
+"định\n"
 "                              nhiều lần (bản trích yếu)\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2871,30 +3150,32 @@ msgstr ""
 "  -U, --update                cập nhật tập tin cũ.po,\n"
 "                              không làm gì nếu nó đã cập nhật rồi\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, 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:547
+#: src/msgmerge.c:588
 #, 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:549
+#: src/msgmerge.c:590
 #, 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:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=HẬU_TỐ         có quyền cao hơn hậu tố sao lưu bình thường\n"
+msgstr ""
+"      --suffix=HẬU_TỐ         có quyền cao hơn hậu tố sao lưu bình thường\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2914,115 +3195,137 @@ msgstr ""
 "  simple, never  luôn luôn tạo bản sao lưu đơn giản\n"
 "(đơn giản, không bao giờ)\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "Hậu tố sao lưu là “~” trừ khi được đặt bằng tùy chọn “--suffix” (hậu tố)\n"
 "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:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 chấp nhận chuỗi định dạng Boost\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              giữ lại các chuỗi gốc msgid cũ của chuỗi đã dịch\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              giữ lại các chuỗi gốc msgid cũ của chuỗi đã "
+"dịch\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       không hiển thị tiến trình\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "chuỗi này nên dùng ở dạng thức số nhiều"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, tạm dịch %ld, thiếu %ld, không dùng nữa %ld.\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, tạm dịch %ld, thiếu %ld, không dùng "
+"nữa %ld.\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " xong.\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]…\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Chuyển đổi catalog bản dịch nhị phân sang tập tin dạng .po kiểu Uniforum.\n"
+msgstr ""
+"Chuyển đổi catalog bản dịch nhị phân sang tập tin dạng .po kiểu Uniforum.\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr ""
 "  -j, --java                  chế độ Java: đầu vào là lớp ResourceBundle\n"
 "                              kiểu Java\n"
 
-#: src/msgunfmt.c:443
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                chế độ C#: đầu vào là tập tin .dll\n"
 "                              kiểu .NET\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
 msgstr ""
 "      --csharp-resources      chế độ tài nguyên C#: đầu vào là tập tin\n"
 "                             .resources kiểu .NET\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   chế độ Tcl: đầu vào là tập tin\n"
 "                              .msg kiểu tcl/msgcat\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  TẬP_TIN …                   đầu vào  là những tập tin .mo\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "vị trí của tập tin đầu vào trong chế độ Java:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "Tên lớp được quyết định bằng cách phụ thêm tên miền địa phương\n"
 "vào tên tài nguyên, định giới bằng dấu gạch dưới. Hạng được định vị\n"
 "bằng CLASSPATH (đường dẫn lớp).\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Vị trí của tập tin đầu vào trong chế độ C#:\n"
 
-#: src/msgunfmt.c:476
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3032,12 +3335,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:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Vị trí của tập tin đầu vào trong chế độ Tcl:\n"
 
-#: src/msgunfmt.c:486
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3046,17 +3349,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:512
+#: 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:514
+#: 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"
+msgstr ""
+"      --strict                ghi kiểu Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3078,17 +3382,21 @@ 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:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              chỉ in ra trùng lặp\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                chỉ in ra chuỗi duy nhất, hủy các chuỗi trùng lặp\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                chỉ in ra chuỗi duy nhất, hủy các chuỗi trùng "
+"lặp\n"
 
-#: src/open-catalog.c:57 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 "<đầu_vào_tiêu_chuẩn>"
@@ -3151,27 +3459,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "dấu #~ được dùng không thống nhất"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "thiếu phần “msgstr[]”"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "thiếu phần “msgid_plural”"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "thiếu phần “msgstr”"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "dạng thức số nhiều đầu tiên có chỉ số là khác không"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "dạng thức số nhiều có chỉ số không đúng"
@@ -3181,7 +3489,7 @@ msgstr "dạng thức số nhiều có chỉ số không đúng"
 msgid "too many errors, aborting"
 msgstr "quá nhiều lỗi nên hủy bỏ"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "chuỗi nối tiếp đa byte không hợp lệ"
@@ -3191,41 +3499,41 @@ msgstr "chuỗi nối tiếp đa byte không hợp lệ"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "chuỗi nối tiếp đa byte chưa hoàn thành tại kết thúc tập tin"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "chuỗi nối tiếp đa byte chưa hoàn thành tại kết thúc dòng"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv gặp lỗi"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "không biết từ khóa “%s”"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "dây điều khiển không hợp lệ"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "kết thúc tập tin bên trong chuỗi"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "kết thúc dòng bên trong chuỗi"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 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:325 src/xgettext.c:1241
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, 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"
@@ -3255,7 +3563,7 @@ msgstr "thiếu “=” sau \"%s\""
 msgid "invalid non-blank line"
 msgstr "dòng không trắng không hợp lệ"
 
-#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "tập tin “%s” bị cắt ngắn"
@@ -3265,29 +3573,45 @@ msgstr "tập tin “%s” bị cắt ngắn"
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "tập tin “%s” chứa một chuỗi không phải được kết thúc bằng NUL"
 
-#: src/read-mo.c:175 src/read-mo.c:283
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "tập tin “%s” chứa một chuỗi không phải được kết thúc bằng NUL"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "tập tin “%s” không phải có định dạng .mo của GNU"
 
-#: src/read-mo.c:189
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "tập tin “%s” chứa một chuỗi không được kết thúc bằng NUL, tại %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "cảnh báo: cú pháp “\\uxxxx” không hợp lệ với ký tự Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: cảnh báo: chỉ một đồ thay thế U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "cảnh báo: ký tự Unicode không hợp lệ"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "cảnh báo: chuỗi chưa được kết thúc"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "cảnh báo: lỗi cú pháp"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "cảnh báo: cặp khóa/giá trị chưa được kết thúc"
 
@@ -3295,11 +3619,12 @@ msgstr "cảnh báo: cặp khóa/giá trị chưa được kết thúc"
 msgid "warning: syntax error, expected ';' after string"
 msgstr "cảnh báo: lỗi cú pháp; cần dấu chấm phẩy “;” nằm sau chuỗi"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "cảnh báo: lỗi cú pháp; cần dấu bằng “=” hay dấu chấm phẩy “;” nằm sau chuỗi"
+msgstr ""
+"cảnh báo: lỗi cú pháp; cần dấu bằng “=” hay dấu chấm phẩy “;” nằm sau chuỗi"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Viết bởi %s và %s.\n"
@@ -3309,16 +3634,16 @@ msgstr "Viết bởi %s và %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Mã hóa lại văn bản tiếng Xéc-bi từ chữ viết Ki-rin sang chữ viết La-tinh.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3327,27 +3652,27 @@ msgstr ""
 "Văn bản đầu vào được đọc từ đầu vào tiêu chuẩn. Văn bản đã chuyển đổi\n"
 "được xuất vào đầu ra tiêu chuẩn.\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "đầu vào không hợp lệ theo bảng mã ký tự “%s”"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "gặp lỗi khi chuyển đổi từ bảng mã ký tự “%s” sang bảng mã ký tự “%s”"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "cần hai đối số"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] URL TẬP_TIN\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3356,111 +3681,137 @@ msgstr ""
 "Lấy và xuất nội dung của địa chỉ Mạng (URL).\n"
 "URL không thể truy cập được thì TẬP_TIN được dùng thay thế.\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "gặp lỗi khi đọc “%s”"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "gặp lỗi khi ghi vào đầu ra tiêu chuẩn"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "gặp lỗi sau khi đọc “%s”"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Đang lấy %s…"
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr " quá hạn.\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr " gặp lỗi.\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "Không thể xuất nhiều miền thông dịch vào một tập tin riêng lẻ theo định dạng xuất đã xác định. Hãy thử dùng cú pháp tập tin PO thay thế."
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Không thể xuất nhiều miền thông dịch vào một tập tin riêng lẻ theo định dạng "
+"xuất đã xác định. Hãy thử dùng cú pháp tập tin PO thay thế."
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "Không thể xuất nhiều miền thông dịch vào một tập tin riêng lẻ theo định dạng xuất đã xác định."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Không thể xuất nhiều miền thông dịch vào một tập tin riêng lẻ theo định dạng "
+"xuất đã xác định."
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "catalog bản dịch chứa bản dịch phụ thuộc vào ngữ cảnh, mà định dạng xuất không hỗ trợ."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"catalog bản dịch chứa bản dịch phụ thuộc vào ngữ cảnh, mà định dạng xuất "
+"không hỗ trợ."
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ trợ. Hãy thử tạo ra lớp Java bằng lệnh “msgfmt --java”, thay cho tập tin tài nguyên."
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ "
+"trợ. Hãy thử tạo ra lớp Java bằng lệnh “msgfmt --java”, thay cho tập tin tài "
+"nguyên."
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
-msgstr "catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ trợ."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"catalog bản dịch chứa chuỗi ở dạng thức số nhiều, mà định dạng xuất không hỗ "
+"trợ."
 
-#: src/write-catalog.c:232 src/write-catalog.c:276 src/write-xml.c:58
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "không thể tạo tập tin kết xuất “%s”"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "đầu ra tiêu chuẩn"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "gặp lỗi khi tạo thư mục “%s”"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "gặp lỗi khi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xuất chi tiết)"
+msgstr ""
+"gặp lỗi khi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xuất chi tiết)"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "gặp lỗi khi biên dịch lớp C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
-#: src/write-tcl.c:213
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "gặp lỗi khi mở “%s” để ghi"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "không phải tên lớp Java hợp lệ: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "lỗi biên dịch lớp Java, hãy thử tùy chọn “--verbose” (xuất chi tiết) hoặc đặt biến $JAVAC"
+msgstr ""
+"lỗi biên dịch lớp Java, hãy thử tùy chọn “--verbose” (xuất chi tiết) hoặc "
+"đặt biến $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "lỗi biên dịch lớp Java, hãy thử đặt biến $JAVAC"
 
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "chuỗi nối tiếp đa byte không hợp lệ"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "chuỗi đã quốc tế hóa không nên chứa dãy thoát “\\%c”"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3473,7 +3824,7 @@ msgstr ""
 "Đề nghị bạn nhập chuỗi ngữ cảnh msgctxt hoàn toàn ASCII thay thế.\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3497,7 +3848,8 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 ""
@@ -3517,12 +3869,12 @@ msgstr ""
 "hỗ trợ ký tự UTF-8 (Unicode) chỉ trong chuỗi dịch, không phải trong\n"
 "chuỗi gốc.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3531,7 +3883,7 @@ msgstr ""
 "vào ngữ cảnh, còn định dạng .resources (tài nguyên)\n"
 "kiểu C# không hỗ trợ khả năng ngữ cảnh.\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3540,7 +3892,7 @@ msgstr ""
 "còn định dạng .resources (tài nguyên) kiểu C# không\n"
 "hỗ trợ khả năng xử lý dạng số nhiều.\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3549,7 +3901,7 @@ msgstr ""
 "vào ngữ cảnh, còn định dạng kiểu Tcl không hỗ trợ\n"
 "khả năng ngữ cảnh.\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3558,36 +3910,56 @@ msgstr ""
 "còn định dạng kiểu Tcl không hỗ trợ khả năng thao tác\n"
 "dạng thức số nhiều.\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: cảnh báo: biểu thức chính quy chưa được kết thúc"
 
-#: src/x-c.c:1161
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "cảnh báo: ký tự Unicode không hợp lệ"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
 
-#: src/x-c.c:1475 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: cảnh báo: hằng ký tự chưa được kết thúc"
 
-#: src/x-c.c:1531 src/x-c.c:1582 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
 
-#: src/x-csharp.c:225 src/xgettext.c:2365
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã)."
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3596,7 +3968,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3605,7 +3977,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte dài chưa hoàn thành.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3614,7 +3986,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3623,12 +3995,12 @@ msgstr ""
 "%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc dòng.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code” (từ mã).\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: lỗi iconv"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3637,121 +4009,146 @@ msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ.\n"
 "Hãy đưa ra bảng mã ký tự nguồn dùng “--from-code” (từ mã).\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: cảnh báo: hằng chuỗi chưa được kết thúc"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: cảnh báo: gặp dấu ngoặc đóng “)” ở nơi cần dấu ngoặc móc đóng “}”"
+msgstr ""
+"%s:%d: cảnh báo: gặp dấu ngoặc đóng “)” ở nơi cần dấu ngoặc móc đóng “}”"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: cảnh báo: gặp dấu ngoặc móc đóng “}” ở nơi cần dấu ngoặc đóng “)”"
+msgstr ""
+"%s:%d: cảnh báo: gặp dấu ngoặc móc đóng “}” ở nơi cần dấu ngoặc đóng “)”"
 
-#: src/xgettext.c:580
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "“%s” không phải là tên bảng mã. Quay lại dùng ASCII.\n"
 
-#: src/xgettext.c:651
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "không nhận kiểm tra “%s”"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "không biết kiểu kết thúc câu “%s”"
 
-#: src/xgettext.c:714
+#: src/xgettext.c:701
 #, 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 đầu ra tiêu chuẩn"
+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 đầu ra tiêu chuẩn"
 
-#: src/xgettext.c:719
+#: src/xgettext.c:705
 #, 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:855
+#: src/xgettext.c:839
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "cảnh báo: tập tin quy tắc ITS “%s” không tồn tại"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:920
 #, c-format
-msgid "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr "cảnh báo: tập tin quy tắc ITS “%s” không tồn tại; kiểm tra bản cài đặt gettext của bạn"
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr ""
+"cảnh báo: tập tin quy tắc ITS “%s” không tồn tại; kiểm tra bản cài đặt "
+"gettext của bạn"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:938
 #, 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:1040
+#: src/xgettext.c:1027
 #, 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 đầu vào đã cho.\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
 "  -d, --default-domain=TÊN    dùng tập tin TÊN này làm kết xuất\n"
 "                              (thay cho messages.po)\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1052
 #, 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\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=THƯ_MỤC    các tập tin xuất sẽ được để vào thư mục này\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr ""
+"  -p, --output-dir=THƯ_MỤC    các tập tin xuất sẽ được để vào thư mục này\n"
 
-#: src/xgettext.c:1072
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Chọn ngôn ngữ của tập tin đầu vào:\n"
 
-#: src/xgettext.c:1074
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=TÊN          chỉ định ngôn ngữ. Các giá trị có thể là:\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1081
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   dạng viết tắt của “--language=C++”\n"
 
-#: src/xgettext.c:1083
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "Mặc định là ngôn ngữ sẽ được đoán phụ bằng phần mở rộng của tên tập tin đầu vào.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr ""
+"Mặc định là ngôn ngữ sẽ được đoán phụ bằng phần mở rộng của tên tập tin đầu "
+"vào.\n"
 
-#: src/xgettext.c:1088
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3760,35 +4157,39 @@ msgstr ""
 "      --from-code=MÃ         bảng mã ký tự của tập tin đầu vào\n"
 "                                (trừ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1091
+#: src/xgettext.c:1078
 #, 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 đầu vào có bộ ký tự ASCII.\n"
 
-#: src/xgettext.c:1096
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         nối lại các chuỗi với tập tin đã có\n"
 
-#: src/xgettext.c:1098
+#: src/xgettext.c:1085
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr "  -x, --exclude-file=TẬP_TIN.po mục tin từ tập tin này sẽ không được trích ra\n"
+msgstr ""
+"  -x, --exclude-file=TẬP_TIN.po mục tin từ tập tin này sẽ không được trích "
+"ra\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cTHẺ, --add-comments=THẺ   để vào tập tin kết xuất các khối ghi chú\n"
-"                                bắt đầu với thẻ này và nằm trước dòng từ khóa\n"
+"                                bắt đầu với thẻ này và nằm trước dòng từ "
+"khóa\n"
 "  -c, --add-comments          để vào tập tin kết xuất các khối ghi chú nằm\n"
 "                                trước dòng từ khóa\n"
 
-#: src/xgettext.c:1105
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
@@ -3799,7 +4200,7 @@ msgstr ""
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1109
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3810,253 +4211,198 @@ msgstr ""
 "                                (single-space, đây là mặc định,\n"
 "                                 hoặc double-space)\n"
 
-#: src/xgettext.c:1114
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Tùy chọn đặc trưng cho ngôn ngữ:\n"
 
-#: src/xgettext.c:1116
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           trích ra mọi chuỗi\n"
 
-#: src/xgettext.c:1118
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1131
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=TỪ:ĐỐI_SỐ:CỜ     cờ phụ thêm cho chuỗi nằm bên trong đối số\n"
 "                              có số ĐỐI SỐ của từ khóa TỪ\n"
 
-#: src/xgettext.c:1134
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1139
+#: src/xgettext.c:1126
 #, 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\n"
 
-#: src/xgettext.c:1141
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (chỉ những ngôn ngữ C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (chỉ những ngôn ngữ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1130
 #, c-format
 msgid "      --its=FILE              apply ITS rules from FILE\n"
 msgstr "      --its=TẬP_TIN           áp dụng các quy tắc ITS từ TẬP_TIN\n"
 
-#: src/xgettext.c:1145
+#: src/xgettext.c:1132
 #, c-format
 msgid "                                (only XML based languages)\n"
 msgstr "                                (chỉ ngôn ngữ dựa trên XML)\n"
 
-#: src/xgettext.c:1147
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    chấp nhận chuỗi định dạng Qt\n"
 
-#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (chỉ ngôn ngữ C++)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   chấp nhận chuỗi định dạng KDE4\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 chấp nhận chuỗi định dạng Boost\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 kết quả chi tiết hơn về nhận diện định dạng chuỗi\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr ""
+"      --debug                 kết quả chi tiết hơn về nhận diện định dạng "
+"chuỗi\n"
 
-#: src/xgettext.c:1184
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output      ghi ra tập tin .properties\n"
 "                               thuộc tính) kiểu Java\n"
 
-#: src/xgettext.c:1188
+#: src/xgettext.c:1175
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               ghi ra các ghi chú itstool\n"
 
-#: src/xgettext.c:1201
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=CHUỖI  đặt người giữ tác quyền trong kết xuất\n"
+msgstr ""
+"      --copyright-holder=CHUỖI  đặt người giữ tác quyền trong kết xuất\n"
 
-#: src/xgettext.c:1203
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          bỏ phần bản quyền Tổ Chức Phần Mềm Tự Do\n"
 "                              trong kết xuất cho người dùng nước ngoài\n"
 
-#: src/xgettext.c:1205
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=GÓI      đặt tên gói trong kết xuất\n"
 
-#: src/xgettext.c:1207
+#: src/xgettext.c:1194
 #, 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"
+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:1209
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=ĐỊA_CHỈ@THƯ\n"
 "                              đặt địa chỉ thông báo lỗi chuỗi gốc msgid\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -m[CHUỖI], --msgstr-prefix[=CHUỖI]    dùng CHUỖI này hay \"\"\n"
 "                              làm tiền tố cho giá trị msgstr\n"
 
-#: src/xgettext.c:1214
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -M[CHUỖI],  --msgstr-suffix[=CHUỖI]   dùng chuỗi này hay \"\" làm hậu tố\n"
 "                                        cho giá trị msgstr\n"
 
-#: src/xgettext.c:2040
-#, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr "Đối số “--flag” (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
-
-#: src/xgettext.c:2165
-msgid "standard input"
-msgstr "đầu vào tiêu chuẩn"
-
-#: src/xgettext.c:2330
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "Gặp một ký tự không phải ASCII tại %s%s."
-
-#: src/xgettext.c:2334
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "Gặp một ghi chú không phải ASCII nằm tại hay trước %s%s."
-
-#: src/xgettext.c:2339
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "Gặp một chuỗi không phải ASCII tại %s%s."
-
-#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
-#, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: cảnh báo: "
-
-#: src/xgettext.c:2448
+#: src/xgettext.c:1597
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Dù nó được dùng tại một vị trí của chuỗi định dạng, %s không phải là một chuỗi định dạng %s đúng. Lý do: %s\n"
-
-#: src/xgettext.c:2449
-#, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Dù nó được khai báo như vậy, %s không phải là một chuỗi định dạng %s đúng. Lý do: %s\n"
-
-#: src/xgettext.c:2480
-#, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
-"Chuỗi định dạng “%s” có đối số không tên\n"
-"không thể được bản địa hóa cho đúng:\n"
-"dịch giả không thể sắp xếp lại những đối số.\n"
-"Đề nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
-"và sự ánh xạ thay cho bản ghi nhiều thành phần cho những đối số.\n"
-
-#: src/xgettext.c:2545
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
-"Chuỗi gốc msgid trống.\n"
-"Nó được dành riêng bởi phần mềm gettext của GNU:\n"
-"gettext(\"\") sẽ đưa ra siêu thông tin (thông tin đặc biệt),\n"
-"không phải chuỗi trống rỗng.\n"
+"Đối số “--flag” (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
 
-#: src/xgettext.c:3282
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "đặc tả đối chưa rõ ràng cho từ khóa “%.*s”"
-
-#: src/xgettext.c:3309
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "cảnh báo: thiếu ngữ cảnh cho từ khóa “%.*s”"
-
-#: src/xgettext.c:3334
-#, 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ố ở dạng thức số nhiều của từ khóa “%.*s”"
-
-#: src/xgettext.c:3355
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "ngữ cảnh xung đột giữa dạng số ít và số nhiều"
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "đầu vào tiêu chuẩn"
 
-#: src/xgettext.c:3730
+#: src/xgettext.c:1872
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4068,21 +4414,16 @@ msgstr ""
 "hãy chỉ định biến MSGID_BUGS_ADDRESS trong đó;\n"
 "không thì đưa ra tùy chọn dòng lệnh “--msgid-bugs-address”.\n"
 
-#: src/xgettext.c:3948
+#: src/xgettext.c:2088
 #, c-format
 msgid "language '%s' unknown"
 msgstr "không nhận ra ngôn ngữ “%s”"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: cảnh báo: chỉ một đồ thay thế U+%04X"
-
 #: src/x-javascript.c:231
 msgid "Please specify the source encoding through --from-code\n"
 msgstr "Hãychỉ định bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã)\n"
 
-#: src/x-javascript.c:276
+#: src/x-javascript.c:275
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4091,7 +4432,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ. Hãy chỉ định bảng mã\n"
 "ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã).\n"
 
-#: src/x-javascript.c:292
+#: src/x-javascript.c:291
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4101,7 +4442,7 @@ msgstr ""
 "Hãy chỉ định bảng mã ký tự nguồn đúng bằng tùy chọn\n"
 "“--from-code” (từ mã).\n"
 
-#: src/x-javascript.c:304
+#: src/x-javascript.c:303
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4111,7 +4452,7 @@ msgstr ""
 "Hãy chỉ định bảng mã ký tự nguồn đúng bằng cách dùng tùy chọn\n"
 "“--from-code” (từ mã).\n"
 
-#: src/x-javascript.c:313
+#: src/x-javascript.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4121,7 +4462,7 @@ msgstr ""
 "Hãy chỉ định bảng mã ký tự nguồn đúng thông qua tùy chọn\n"
 "“--from-code” (từ mã).\n"
 
-#: src/x-javascript.c:345
+#: src/x-javascript.c:344
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4130,152 +4471,205 @@ msgstr ""
 "%s:%d: Chuỗi đa byte không hợp lệ. Hãy chỉ định\n"
 "bảng mã ký tự nguồn dùng tùy chọn “--from-code” (từ mã).\n"
 
-#: src/x-javascript.c:955
+#: src/x-javascript.c:919
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: cảnh báo: Gặp kết thúc BTCQ quá sớm"
 
-#: src/x-javascript.c:1056
+#: src/x-javascript.c:1027
 #, c-format
 msgid "%s:%d: warning: %s is not allowed"
 msgstr "%s:%d: cảnh báo: không cho phép %s"
 
-#: src/x-javascript.c:1070
+#: src/x-javascript.c:1041
 #, c-format
 msgid "%s:%d: warning: unterminated XML markup"
 msgstr "%s:%d: cảnh báo: đánh dấu XML chưa được hoàn tất"
 
-#: src/x-perl.c:308
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: không tìm thấy ký tự kết thúc chuỗi “%s” ở bất cứ nơi nào trước kết thúc tập tin"
+msgstr ""
+"%s:%d: không tìm thấy ký tự kết thúc chuỗi “%s” ở bất cứ nơi nào trước kết "
+"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:1043
+#: src/x-perl.c:1074
 #, 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:1163
+#: src/x-perl.c:1195
 #, 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:1183
+#: src/x-perl.c:1215
 #, 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:1217
+#: src/x-perl.c:1249
 #, 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:1230
+#: src/x-perl.c:1262
 #, 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:1247
+#: src/x-perl.c:1279
 #, 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-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc bằng ghi chú như được ghi rõ trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:324
-#, c-format
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc bằng ghi chú như được chỉ ra trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:341
-#, c-format
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: chuỗi đa byte dài chưa hoàn thành.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
-#, c-format
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:364
-#, c-format
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc của dòng.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:397
-#, c-format
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ.\n"
 "Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã),\n"
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Không nhận ra bảng mã ký tự “%s” nên tiếp tục với ASCII để thay thế."
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: chuỗi gốc không hợp lệ"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: thiếu con số nằm sau dấu #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: dạng thức chuỗi không hợp lệ"
 
-#: src/x-sh.c:1075
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: chuỗi gốc không hợp lệ"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: chuỗi gốc không hợp lệ"
+
+#: src/x-rst.c:691
 #, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: cảnh báo: cú pháp $\"…\" đã lạc hậu vì lý do bảo mật; hãy dùng eval_gettext thay thế."
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
+
+#: src/x-sh.c:1101
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: cảnh báo: cú pháp $\"…\" đã lạc hậu vì lý do bảo mật; hãy dùng "
+"eval_gettext thay thế."
 
-#: src/x-vala.c:414
+#: src/x-vala.c:616
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: cảnh báo: gặp kết thúc biểu thức chính quy quá sớm"
@@ -4406,6 +4800,108 @@ msgstr "bên trong ghi chú hoặc chỉ lệnh xử lý"
 msgid "document ended unexpectedly: %s"
 msgstr "tài liệu bị kết thúc bất thường: %s"
 
+#, 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"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: không nhận ra tùy chọn “--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n"
+
+#, 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"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr ""
+#~ "cảnh báo: phiên bản msgfmt cũ hơn sẽ thông báo lỗi trong trường hợp này.\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "Gặp một ký tự không phải ASCII tại %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "Gặp một ghi chú không phải ASCII nằm tại hay trước %s%s."
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "Gặp một chuỗi không phải ASCII tại %s%s."
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: cảnh báo: "
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "Dù nó được dùng tại một vị trí của chuỗi định dạng, %s không phải là một "
+#~ "chuỗi định dạng %s đúng. Lý do: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr ""
+#~ "Dù nó được khai báo như vậy, %s không phải là một chuỗi định dạng %s "
+#~ "đúng. Lý do: %s\n"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "Chuỗi định dạng “%s” có đối số không tên\n"
+#~ "không thể được bản địa hóa cho đúng:\n"
+#~ "dịch giả không thể sắp xếp lại những đối số.\n"
+#~ "Đề nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
+#~ "và sự ánh xạ thay cho bản ghi nhiều thành phần cho những đối số.\n"
+
+#~ 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 ""
+#~ "Chuỗi gốc msgid trống.\n"
+#~ "Nó được dành riêng bởi phần mềm gettext của GNU:\n"
+#~ "gettext(\"\") sẽ đưa ra siêu thông tin (thông tin đặc biệt),\n"
+#~ "không phải chuỗi trống rỗng.\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "đặc tả đối chưa rõ ràng cho từ khóa “%.*s”"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "cảnh báo: thiếu ngữ cảnh cho từ khóa “%.*s”"
+
+#, 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ố ở dạng thức số nhiều của từ khóa "
+#~ "“%.*s”"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "ngữ cảnh xung đột giữa dạng số ít và số nhiều"
+
 #~ msgid "The root element <%s> is not allowed in a valid CLDR file"
 #~ msgstr "Phần tử gốc <%s> là không được phép trong một tập tin CLDR hợp lệ"
 
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index 0cbdaf50c..9fcd33ba5 100644
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -3,31 +3,34 @@
 # This file is distributed under the same license as the gettext package.
 # Funda Wang <fundawang@linux.net.cn>, 2004.
 # Ji ZhengYu <zhengyuji@gmail.com>, 2015.
+# Boyuan Yang <073plan@gmail.com>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.4.73\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-06-23 15:18+0900\n"
-"PO-Revision-Date: 2015-09-01 16:16中国标准时间\n"
-"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2018-09-24 20:24-0400\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.1.1\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s 的参数 %1$s 无效"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的参数 %1$s 有歧义"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
 msgstr "有效的参数为: "
 
@@ -55,151 +58,133 @@ msgstr "无法删除临时目录 %s"
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "保存 %s 的权限"
 
-#: gnulib-lib/copy-file.c:189
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "读取 %s 时出错"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "无法写入备份文件 %s"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 出错"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "写入 %s 出错"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "读取 %s 后出错"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
-#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232 src/msginit.c:1397
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() 失败"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr "未找到 C# 编译器，试着安装 pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
+msgstr "未找到 C# 编译器，尝试安装 pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr "未找到 C# 虚拟机，试着安装 pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
+msgstr "未找到 C# 虚拟机，尝试安装 pnet"
 
-#: gnulib-lib/error.c:191
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 子进程失败"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: 选项“%s”有歧义;可能是:"
-
-#: gnulib-lib/getopt.c:619
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:278
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: 选项“%s”有歧义\n"
 
-#: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: 选项“--%s”不允许有参数\n"
+#: gnulib-lib/getopt.c:284
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: 选项“%s”有歧义;可能是:"
 
-#: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:319
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: 无法识别的选项“%c%s”\n"
+
+#: gnulib-lib/getopt.c:345
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: 选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:360
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: 选项“--%s”需要参数\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 无法识别的选项“--%s”\n"
-
-#: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 无法识别的选项“%c%s”\n"
-
-#: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
+#: gnulib-lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 无效选项 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
-#: gnulib-lib/getopt.c:1136
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 选项需要参数 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: 选项“-W %s”歧义\n"
-
-#: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: 选项“-W %s”不允许参数\n"
-
-#: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: 选项“-W %s”需要参数\n"
-
-#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
-#: gnulib-lib/javacomp.c:151
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 source_version 参数"
 
-#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 target_version 参数"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s”失败"
 
-#: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-java.c:1157 src/write-java.c:1198
-#: src/write-mo.c:812 src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "写入“%s”出错"
 
-#: gnulib-lib/javacomp.c:2338
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "未找到 Java 编译器，试着安装 gcj 或设置 $JAVAC"
@@ -209,47 +194,46 @@ 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:906 src/msginit.c:981
-#: src/msginit.c:1141 src/msginit.c:1405
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/format-kde-kuit.c:239 src/msgl-check.c:564
-#: src/po-lex.c:83 src/po-lex.c:102 src/x-glade.c:549
-#: libgettextpo/gettext-po.c:1326
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
 msgstr "线程创建失败"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
-#: src/msgexec.c:427
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "写入 %s 子进程失败"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "由 %s 子进程读入数据时出现错误"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "无法为 %s 子进程创建非专用的 I/O"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "和 %s 子进程通讯时出现错误"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 子进程已终止，错误码为 %d"
@@ -273,13 +257,13 @@ msgstr "%s 子进程已终止，错误码为 %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
 msgstr "“"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
 msgstr "”"
 
@@ -288,129 +272,292 @@ msgstr "”"
 msgid "setting permissions for %s"
 msgstr "设置 %s 的权限"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "无法创建管道"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失败"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:90
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "无法还原文件描述符 %d: dup2 错误"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
 msgstr "%s 子进程"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 子进程收到致命信号 %d"
 
-#: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217 src/xgettext.c:2036
-#: src/xgettext.c:2049 src/xgettext.c:2059
+#: src/cldr-plurals.c:61
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "打开“%s”读取时出错"
+msgid "Could not parse file %s as XML"
+msgstr ""
 
-#: src/format.c:152
+#: src/cldr-plurals.c:69
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "不像“%3$s”，“%1$s”不是有效的 %2$s 格式字符串。原因: %4$s"
+msgid "The root element must be <%s>"
+msgstr "根元素必须为 <%s>"
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "元素 <%s> 不含有 <%s> 元素"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr "元素 <%s> 不含有 <%s> 属性"
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "试试“%s --help”查看帮助信息。\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "用法：%s [选项...] [LOCALE 规则]...\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+"提取或转换 Unicode CLDR 复数规则。\n"
+"\n"
+"如果同时指定了<LOCALE>和<规则>，程序将从给定<规则>中读取指定<LOCALE>的\n"
+"CLDR 复数规则，并将其输出为适合 gettext 使用的表格。\n"
+"如果没有给定参数，程序将从标准输入读取 CLDR 复数规则。\n"
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, c-format, no-wrap
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
+msgstr ""
+"长选项必须用的参数在使用短选项时也是必须的。\n"
+"可选参数也是如此。\n"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/cldr-plurals.c:211
 #, c-format
-msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -c, --cldr                  以 CLDR 格式输出复数规则\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  显示此帮助并退出\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               输出版本信息并退出\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"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/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "由 %s 编写。\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr "Daiki Ueno"
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr "无法读取 %s"
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr "无法为 %s 提取规则"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr "无法解析 CLDR 规则"
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr "额外的操作数 %s"
+
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
+#, c-format
+msgid "error while opening \"%s\" for reading"
+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-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
 msgstr "参数\"%u\"(如同\"%s\")的格式指定在\"%s\"中不存在"
 
-#: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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:541 src/format-boost.c:649 src/format-c.c:147
-#: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
-#: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
-#: src/format-tcl.c:422
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
+#: 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 '%s' and '%s' for argument %u are not the same"
 msgstr "参数 %3$u 的指定格式在“%1$s”和“%2$s”中不同"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "第 %u 条指令以“|”开始但并不以“|”。"
 
-#: src/format-c.c:37
+#: src/format.c:152
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "第 %u 条指令中，“<”后的记号并不是格式指定符宏的名称。有效的宏名列在 ISO C 99 章节 7.8.1 中。"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr "不像“%3$s”，“%1$s”不是有效的 %2$s 格式字符串。原因: %4$s"
 
-#: src/format-c.c:40
+#: src/format-c.c:36
+#, c-format
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"第 %u 条指令中，“<”后的记号并不是格式指定符宏的名称。有效的宏名列在 ISO C 99 "
+"章节 7.8.1 中。"
+
+#: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "第 %u 条指令中，没有与“<”匹配的“>”。"
 
-#: src/format-c.c:43 src/format-gfc-internal.c:289
+#: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字符串引用了第 %u 个参数但是却忽略了第 %u 个参数。"
 
-#: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "“%s”和“%s”中的指定格式数量不匹配"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "第 %u 条指令中，“{”后没有参数编号。"
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "第 %u 条指令中，“,”后没有参数编号。"
 
-#: src/format-csharp.c:131 src/format-java.c:192
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "指令中间字符串发生中断：发现了“{”但没有匹配的“}”。"
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "第 %u 条指令中以无效的字符“%c”而非“}”结束。"
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "第 %u 条指令以无效的字符而非“}”结束。"
 
-#: src/format-csharp.c:162 src/format-java.c:347
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
 msgstr "指令中间开始字符串：发现了“}”但没有匹配的“{”。"
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "第 %u 条指令之后的字符串包含独立的“}”。"
@@ -427,12 +574,16 @@ msgstr "第 %u 条指令中，“%c”前不允许有精度。"
 
 #: 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."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "第 %u 条指令中，精度的参数个数必须是 %u 个。"
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "第 %u 条指令中，‘%c’前不允许指定精度。"
 
 #: src/format-gcc-internal.c:406
@@ -470,32 +621,43 @@ msgid "The string ends in the middle of a directive."
 msgstr "字符串于指令中间结束。"
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr "字符串同时使用两种方式引用了参数：绝对参数编号和未编号参数指定符。"
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "第 %u 条指令中，第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "第 %u 条指令中，宽度的第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "第 %u 条指令中，精度的第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "第 %u 条指令中，字符“%c”不是有效的对话指定符。"
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "终止第 %u 条指令的字符不是有效的转换指示符。"
 
 #: src/format-invalid.h:40
@@ -503,62 +665,75 @@ msgstr "终止第 %u 条指令的字符不是有效的转换指示符。"
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "字符串引用第 %u 个参数的方法不兼容。"
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
 msgstr "第 %u 条指令中，子字符串“%s”不是有效的日期/时间风格。"
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "第 %u 条指令中，“%s”后面没有逗号。"
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "第 %u 条指令中，子字符串“%s”不是有效的数字格式。"
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+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”之一。"
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "第 %u 条指令中，选择不包含数字。"
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
 msgstr "第 %u 条指令中，选择包含的数字后面没有“<”、“#”或“%s”。"
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "参数{%u}(如同\"%s\")的格式指定在\"%s\"中不存在"
 
-#: src/format-java.c:757
+#: 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:777
+#: src/format-java.c:776
 #, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "参数 {%3$u} 在“%1$s”和“%2$s”中的格式指定不相同"
 
-#: src/format-kde.c:159
+#: src/format-kde.c:158
 #, c-format
-msgid "The string refers to argument number %u but ignores the arguments %u and %u."
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
 msgstr "字符串引用了第 %u 个参数但是却忽略了第 %u 个和第 %u 个参数。"
 
-#: src/format-kde.c:243
+#: src/format-kde.c:242
 #, c-format
-msgid "a format specification for arguments %u and %u doesn't exist in '%s', only one argument may be ignored"
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
 msgstr "参数%u 和%u 的格式定义在“%s”中不存在，仅可忽略一个参数"
 
-#: src/format-kde-kuit.c:251 src/format-kde-kuit.c:261
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
 #, c-format
 msgid "error while parsing: %s"
 msgstr "错误，正处理: %s"
@@ -566,13 +741,19 @@ msgstr "错误，正处理: %s"
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
+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”。"
 
 #: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
+msgid ""
+"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."
 msgstr[0] "第 %u 条指令中，给出的参数太多；最多只需要 %u 个参数。"
 
 #: src/format-lisp.c:2499 src/format-scheme.c:2501
@@ -603,7 +784,9 @@ msgstr "第 %u 条指令中，同时给出了 @ 和 : 修饰符。"
 
 #: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
 msgstr "第 %u 条指令中，“~:[”后面没有两个用“~;”分隔的子句。"
 
 #: src/format-lisp.c:3329 src/format-scheme.c:3265
@@ -625,375 +808,392 @@ msgstr "“%s”和“%s”中的格式指定符不同"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "“%s”中的格式指定符不是“%s”格式指定符的子集"
 
-#: src/format-perl.c:434
-#, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr "第 %u 条指令中，大小指定符与转换指定符“%c”不兼容。"
-
-#: src/format-perl-brace.c:199 src/format-python.c:472
-#: src/format-python-brace.c:435 src/format-python-brace.c:448
-#: src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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:116
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr "字符串同时使用两种方式引用了参数：通过参数名称和未命名参数指定符。"
-
-#: src/format-python.c:355
-#, c-format
-msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "字符串对名为“%s”的参数引用方式不兼容。"
-
-#: src/format-python.c:431
-#, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "“%s”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
-
-#: src/format-python.c:438
-#, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "“%s”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
-
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-perl.c:433
 #, c-format
-msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "参数\"%s\"(如同\"%s\")的格式指定在\"%s\"中不存在"
-
-#: src/format-python.c:495
-#, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "“%s”和“%s”中对参数“%s”的格式指定不同"
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr "第 %u 条指令中，大小指定符与转换指定符“%c”不兼容。"
 
 #: src/format-python-brace.c:138
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "第 %u 条指令中，“%c”不可以field name 开始。"
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "第 %u 条指令中，“%c”不可以getattr 参数开始。"
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "第 %u 条指令中，“%c”不可以getitem 参数开始。"
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "第 %u 条指令中，格式定义中不允许过多嵌套。"
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "第 %u 条指令中，格式指令中无终止符。"
 
-#: src/format-qt.c:153
+#: 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:354
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
-msgstr "'%s' 仅仅是个格式字符串，但‘%s’不是：它包含一个‘L’标记或是一个两位数的参数值"
+msgid "The string refers to the argument named '%s' in incompatible ways."
+msgstr "字符串对名为“%s”的参数引用方式不兼容。"
 
-#: src/format-sh.c:80
+#: src/format-python.c:430
+#, c-format
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr "“%s”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
+
+#: src/format-python.c:437
+#, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr "“%s”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
+
+#: 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 '%s'"
+msgstr "参数\"%s\"(如同\"%s\")的格式指定在\"%s\"中不存在"
+
+#: src/format-python.c:494
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr "“%s”和“%s”中对参数“%s”的格式指定不同"
+
+#: src/format-qt.c:152
+#, c-format
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
+msgstr ""
+"'%s' 仅仅是个格式字符串，但‘%s’不是：它包含一个‘L’标记或是一个两位数的参数值"
+
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "字符串以非 ASCII 名称引用 shell 变量。"
 
-#: src/format-sh.c:82
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "字符串引用的 shell 变量中大括号语法过于复杂。为安全起见，此语法不被支持。"
+#: src/format-sh.c:81
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"字符串引用的 shell 变量中大括号语法过于复杂。为安全起见，此语法不被支持。"
 
-#: src/format-sh.c:84
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
+#: src/format-sh.c:83
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
 msgstr "字符串引用的 shell 变量值可能在 shell 函数中有所不同。"
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "字符串以空名称引用 shell 变量。"
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
 msgstr "第 %u 条指令中，字符“%c”不是介于 1 和 9 之间的数字。"
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
-
-#: src/hostname.c:181 src/msgattrib.c:356 src/msgcat.c:295 src/msgcmp.c:173
-#: src/msgcomm.c:286 src/msgconv.c:245 src/msgen.c:242 src/msgexec.c:187
-#: src/msgfilter.c:289 src/msgfmt.c:417 src/msggrep.c:420 src/msginit.c:269
-#: src/msgmerge.c:357 src/msgunfmt.c:263 src/msguniq.c:265
-#: src/recode-sr-latin.c:111 src/urlget.c:144 src/xgettext.c:646
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
-"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:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgcmp.c:179
-#: src/msgcomm.c:292 src/msgconv.c:251 src/msgen.c:248 src/msgexec.c:193
-#: src/msgfilter.c:295 src/msgfmt.c:423 src/msggrep.c:426 src/msginit.c:275
-#: src/msgmerge.c:363 src/msgunfmt.c:269 src/msguniq.c:271 src/urlget.c:150
-#: src/xgettext.c:652
-#, c-format
-msgid "Written by %s.\n"
-msgstr "由 %s 编写。\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
-#: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
-#: src/urlget.c:150
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:197 src/msginit.c:285 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: src/hostname.c:210 src/msgattrib.c:418 src/msgcat.c:364 src/msgcmp.c:210
-#: src/msgcomm.c:356 src/msgconv.c:304 src/msgen.c:301 src/msgexec.c:260
-#: src/msgfilter.c:410 src/msgfmt.c:771 src/msggrep.c:513 src/msginit.c:359
-#: src/msgmerge.c:495 src/msgunfmt.c:424 src/msguniq.c:323
-#: src/recode-sr-latin.c:144 src/urlget.c:173 src/xgettext.c:900
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "试试“%s --help”查看帮助信息。\n"
-
-#: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [选项]\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "打印机器的主机名。\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "输出格式：\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 短主机名\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
 msgstr "  -f, --fqdn, --long          长主机名，包括全称域名和别名\n"
 
-#: src/hostname.c:228
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:917 src/msggrep.c:629 src/msginit.c:421
-#: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1080
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
-#: src/hostname.c:233 src/msgattrib.c:537 src/msgcat.c:472 src/msgcmp.c:261
-#: src/msgcomm.c:458 src/msgconv.c:388 src/msgen.c:384 src/msgexec.c:309
-#: src/msgfilter.c:510 src/msgfmt.c:919 src/msggrep.c:631 src/msginit.c:423
-#: src/msgmerge.c:622 src/msgunfmt.c:530 src/msguniq.c:420
-#: src/recode-sr-latin.c:165 src/urlget.c:189 src/xgettext.c:1082
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  显示此帮助并退出\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "无法获得主机名"
 
-#: src/hostname.c:235 src/msgattrib.c:539 src/msgcat.c:474 src/msgcmp.c:263
-#: src/msgcomm.c:460 src/msgconv.c:390 src/msgen.c:386 src/msgexec.c:311
-#: src/msgfilter.c:512 src/msgfmt.c:921 src/msggrep.c:633 src/msginit.c:425
-#: src/msgmerge.c:624 src/msgunfmt.c:532 src/msguniq.c:422
-#: src/recode-sr-latin.c:168 src/urlget.c:191 src/xgettext.c:1084
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               输出版本信息并退出\n"
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
+msgstr "未指定选择器"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:242 src/msgattrib.c:546 src/msgcat.c:481 src/msgcmp.c:270
-#: src/msgcomm.c:467 src/msgconv.c:397 src/msgen.c:393 src/msgexec.c:318
-#: src/msgfilter.c:519 src/msgfmt.c:932 src/msggrep.c:640 src/msginit.c:432
-#: src/msgmerge.c:635 src/msgunfmt.c:541 src/msguniq.c:429
-#: src/recode-sr-latin.c:175 src/urlget.c:200 src/xgettext.c:1091
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr "无法创建 XPath 上下文"
 
-#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "无法获得主机名"
+msgid "cannot evaluate XPath expression: %s"
+msgstr "无法计算 XPath 表达式：%s"
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr "“%s”节点不含有“%s”"
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "无效的属性值“%s”（用于“%s”）"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr "根元素不是 %s 命名空间下的“规则”（“rules”）"
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "无法读取 %s：%s"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr "无法计算 XPath 地址路径：%s"
 
-#: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
-#: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr "“%s”节点不含有“%s”"
+
+#: src/locating-rule.c:307
+#, c-format
+msgid "cannot read XML file %s"
+msgstr "无法读取 XML 文件 %s"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr "根元素不是“locatingRules”"
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "允许最多一个输入文件"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:471 src/msgfmt.c:479
-#: src/msgfmt.c:494 src/msgfmt.c:516 src/msggrep.c:447 src/msgmerge.c:388
-#: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:662 src/xgettext.c:669 src/xgettext.c:672
-#: src/xgettext.c:675
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s 和 %s 互相排斥"
+msgstr "%s 和 %s 互斥"
 
-#: src/msgattrib.c:422 src/msgconv.c:308 src/msggrep.c:517 src/msguniq.c:327
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [选项] [输入文件]\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, 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:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
-#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
-#: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
-#: src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
-#: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:789 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:918
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:436 src/msgconv.c:321 src/msggrep.c:532 src/msguniq.c:348
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
-#: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:793 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:924
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 
-#: src/msgattrib.c:440 src/msgconv.c:325 src/msgexec.c:297 src/msgfilter.c:431
-#: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:815 src/msggrep.c:539
-#: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:929
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:817 src/msgfmt.c:866
-#: src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492 src/msguniq.c:357
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
-#: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
-#: src/msgunfmt.c:494 src/msguniq.c:359
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, 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:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
 msgstr "消息选择：\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            保留已翻译的，去掉未翻译的消息\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:468
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:470
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:472
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:474
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:476
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1002,184 +1202,202 @@ msgstr ""
 "      --previous              设置“fuzzy”标记时，\n"
 "                              保留原翻译信息前的msgids。\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:478
 #, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
 msgstr "      --clear-previous        从所有条目中删除“previous msgid”\n"
 
-#: src/msgattrib.c:481
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
 msgstr "      --empty                 删除“fuzzy”标记时，总是清空msgstr\n"
 
-#: src/msgattrib.c:483
+#: src/msgattrib.c:482
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=文件.po     只处理列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:485
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+msgid ""
+"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=文件.po   只处理未列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:487
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等于 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:489
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
-#: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:879 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
-#: src/msguniq.c:370
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:494 src/msgconv.c:345 src/msgen.c:339 src/msgexec.c:302
-#: src/msgfilter.c:465 src/msggrep.c:588 src/msginit.c:394 src/msguniq.c:372
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgattrib.c:496 src/msgconv.c:347 src/msgen.c:341 src/msgexec.c:304
-#: src/msgfilter.c:467 src/msggrep.c:590 src/msginit.c:396 src/msguniq.c:374
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:907 src/msggrep.c:593
-#: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1026
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
-#: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1028
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
 msgstr ""
 "      --color                 总是使用颜色及其它文本属性\n"
 "      --color=WHEN            如果符合 WHEN，就使用颜色及其它文本属性。\n"
-"                              WHEN 可以是‘always’，‘never’，‘auto’或‘html’。\n"
+"                              WHEN 可以"
+"是‘always’，‘never’，‘auto’或‘html’。\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
-#: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1032
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
-#: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1034
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             不在输出中使用 C 转码序列(默认)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
-#: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1036
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转码序列，没有扩展字符\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
-#: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1038
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1040
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1042
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不写入“#: 文件名:行号”位置行\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1044
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生成“#: 文件名:行号”位置行(默认)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1046
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
-#: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
-#: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
-#: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1050
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
-#: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1052
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页面宽度\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
-#: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1054
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
-#: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1057
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出前排序\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
-#: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1059
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: 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:368 src/msgcomm.c:360 src/xgettext.c:904
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1202,23 +1420,23 @@ msgstr ""
 "翻译内容、自行加上的批注和源程序代码批注，以及文件中的位置等都会累积，\n"
 "除非使用了 --use-first选项，那样则会由第一个包含该翻译条目的文件获取数据。\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:920
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:922
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:795
-#: src/xgettext.c:926
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1227,7 +1445,7 @@ msgstr ""
 "  -<, --less-than=数字        只打印出现次数少于指定次数的消息，若没有\n"
 "                              指定次数则默认值为无穷大\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1236,7 +1454,7 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1245,26 +1463,28 @@ msgstr ""
 "  -u, --unique                --less-than=2 的缩写，要求只列出出现一次\n"
 "                              的消息\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:881
-#: src/msgmerge.c:576
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:883
-#: src/msgmerge.c:578
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
+msgstr ""
+"      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名称          输出的编码\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1273,32 +1493,33 @@ msgstr ""
 "      --use-first             对每条消息均使用第一个可用的翻译，不合并若干\n"
 "                              种翻译\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=CATALOGNAME      在文件头中设定 'Language'\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:190 src/msgmerge.c:374
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "没有给出输入文件"
 
-#: src/msgcmp.c:195 src/msgmerge.c:379
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要两个输入文件"
 
-#: src/msgcmp.c:214 src/msgmerge.c:499
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [选项] def.po ref.pot\n"
 
-#: src/msgcmp.c:219
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1314,83 +1535,85 @@ msgstr ""
 "此程序可用来检查程序中的所有的消息是否都已经翻译好了。比较时如果\n"
 "有不完全匹配的字符串出现，程序会以模糊配对的方式得出较好的结果。\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      翻译\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     对源文件的引用\n"
 
-#: src/msgcmp.c:240 src/msgmerge.c:565
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "操作修饰：\n"
 
-#: src/msgcmp.c:242 src/msgmerge.c:567
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
+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:244 src/msgmerge.c:569
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不使用模糊匹配\n"
 
-#: src/msgcmp.c:246
+#: src/msgcmp.c:244
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             使用标记为 fuzzy 的条目\n"
 
-#: src/msgcmp.c:248
+#: src/msgcmp.c:246
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      使用未翻译的条目\n"
 
-#: src/msgcmp.c:325
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "此条目未翻译"
 
-#: src/msgcmp.c:331
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "此条目需要由翻译者复审"
 
-#: src/msgcmp.c:370 src/msgmerge.c:1523
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "此消息使用了但却未定义..."
 
-#: src/msgcmp.c:373 src/msgmerge.c:1526
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但此定义十分类似"
 
-#: src/msgcmp.c:378 src/msgmerge.c:1554
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "此消息已使用，但未定义于 %s 中"
 
-#: src/msgcmp.c:547
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "警告：此消息未使用"
 
-#: src/msgcmp.c:554 src/msgfmt.c:653 src/msgfmt.c:1444 src/xgettext.c:883
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "发现 %d 处致命错误"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "需要至少指定两个文件"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1410,7 +1633,7 @@ msgstr ""
 "但只会保留最先定义这些信息的 PO 文件中的内容。\n"
 "所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1419,65 +1642,67 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1061
+#: src/msgcomm.c:451 src/xgettext.c:1186
 #, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
 msgstr "      --omit-header           不写入带有“msgid \"\"”项的文件头项\n"
 
-#: src/msgconv.c:312
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
 
-#: src/msgconv.c:336
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "转换目标：\n"
 
-#: src/msgconv.c:340
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "默认编码为当前区域设置的编码。\n"
 
-#: src/msgconv.c:364 src/msgen.c:360 src/msgmerge.c:598
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:366 src/msgen.c:362 src/msgfilter.c:488 src/msggrep.c:609
-#: src/msgmerge.c:600
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:368 src/msgen.c:364 src/msgfilter.c:490 src/msggrep.c:611
-#: src/msgmerge.c:602
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:370 src/msgen.c:366 src/msgfilter.c:492 src/msggrep.c:613
-#: src/msgmerge.c:604
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:259 src/msgfmt.c:434 src/xgettext.c:692
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
 
-#: src/msgen.c:264
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要一个输入文件"
 
-#: src/msgen.c:305
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [选项] 输入文件\n"
 
-#: src/msgen.c:310
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1489,22 +1714,22 @@ msgstr ""
 "(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串，\n"
 "并标记为模糊。\n"
 
-#: src/msgen.c:322
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
 
-#: src/msgexec.c:203
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
 msgstr "丢失命令名"
 
-#: src/msgexec.c:264
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [选项] 命令 [命令选项]\n"
 
-#: src/msgexec.c:269
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1519,7 +1744,7 @@ msgstr ""
 "即是 msgexec 的输出结果。msgexec 的返回值是所有\n"
 "命令调用产生的返回值的最大值。\n"
 
-#: src/msgexec.c:278
+#: src/msgexec.c:276
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1528,47 +1753,47 @@ msgstr ""
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:283
+#: src/msgexec.c:281
 #, c-format
 msgid "Command input:\n"
 msgstr "命令输入:\n"
 
-#: src/msgexec.c:285
+#: src/msgexec.c:283
 #, c-format
 msgid "  --newline                   add newline at the end of input\n"
 msgstr "  --newline                   在输入末尾添加换行符\n"
 
-#: src/msgexec.c:293 src/msgfilter.c:427
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
 
-#: src/msgexec.c:357
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "写入 stdout 失败"
 
-#: src/msgfilter.c:305
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:414
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:418
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:441
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1577,12 +1802,12 @@ msgstr ""
 "FILTER 可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:446
 #, c-format
 msgid "Filter input and output:\n"
 msgstr "Filter 输入与输出:\n"
 
-#: src/msgfilter.c:449
+#: src/msgfilter.c:448
 #, c-format
 msgid ""
 "  --newline                   add a newline at the end of input and\n"
@@ -1591,292 +1816,318 @@ msgstr ""
 "  --newline                   在输入流结尾添加一个换行符\n"
 "                                并移除输出流结尾的换行符"
 
-#: src/msgfilter.c:453
+#: src/msgfilter.c:452
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "FILTER设为“sed”是有用的FILTER-OPTION:\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT       将<SCRIPT>添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
-msgstr "  -f, --file=SCRIPTFILE         将<SCRIPTFILE>的内容添加到欲执行的命令中\n"
+msgstr ""
+"  -f, --file=SCRIPTFILE         将<SCRIPTFILE>的内容添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       禁用对模式空白的自动打印\n"
 
-#: src/msgfilter.c:478 src/msggrep.c:601
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             在输出中不使用 C 转义字符(默认)\n"
 
-#: src/msgfilter.c:484 src/msggrep.c:607
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:486
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保持文件头项不变，不过滤它\n"
 
-#: src/msgfilter.c:666
+#: src/msgfilter.c:665
 #, c-format
 msgid "filter output is not terminated with a newline"
 msgstr "filter 输出未以换行符终止"
 
-#: src/msgfmt.c:346
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的参数应该是一个标点符号"
 
-#: src/msgfmt.c:393
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:423 src/msgunfmt.c:269 src/xgettext.c:652
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:440
+#: src/msgfmt.c:471
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "若指定了%s 和%s，则无需指定输入文件"
 
-#: src/msgfmt.c:485 src/msgfmt.c:507 src/msgfmt.c:529 src/msgunfmt.c:331
-#: src/msgunfmt.c:354
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:500 src/msgfmt.c:522 src/msgfmt.c:557 src/msgunfmt.c:324
-#: src/msgunfmt.c:347
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:539
+#: src/msgfmt.c:571 src/msgfmt.c:599
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s 需要指定“--template template”选项"
 
-#: src/msgfmt.c:546
+#: src/msgfmt.c:578 src/msgfmt.c:606
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s 需要指定“-o file”选项"
 
-#: src/msgfmt.c:552
+#: src/msgfmt.c:584 src/msgfmt.c:612
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "在%3$s 中%1$s 和 %2$s 互斥"
 
-#: src/msgfmt.c:566 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:626 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:572 src/msgfmt.c:578
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "无法定位 %s 的 ITS 规则"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:741
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:745
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d 条已翻译消息"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d 条模糊消息"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d 条未翻译消息"
 
-#: src/msgfmt.c:775
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] filename.po ...\n"
 
-#: src/msgfmt.c:779
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:784 src/xgettext.c:913
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-"长选项必须用的参数在使用短选项时也是必须的。\n"
-"可选参数也是如此。\n"
-
-#: src/msgfmt.c:791
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:798 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:962
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:800
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
 msgstr "  -j, --java                  Java 模式：生成 Java 资源包类\n"
 
-#: src/msgfmt.c:802
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
 msgstr ""
 "      --java2                 类似 --java，但假设是 Java2 (JDK 1.2 或较新\n"
 "                              的版本)\n"
 
-#: src/msgfmt.c:804
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
-#: src/msgfmt.c:806
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
 msgstr "      --csharp-resources      C# 资源模式：生成 .NET .resources 文件\n"
 
-#: src/msgfmt.c:808
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：生成 tcl/msgcat .msg 文件\n"
 
-#: src/msgfmt.c:810
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 
-#: src/msgfmt.c:812
+#: src/msgfmt.c:943
 #, c-format
-msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --desktop               桌面访问模式: 生成 .desktop 文件\n"
 
-#: src/msgfmt.c:819
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --xml                   XML 模式：生成 XML 文件\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:821 src/xgettext.c:937
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:824
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模式输出文件位置：\n"
 
-#: src/msgfmt.c:826 src/msgfmt.c:842 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资源         资源名称\n"
 
-#: src/msgfmt.c:828 src/msgfmt.c:844 src/msgfmt.c:854 src/msgfmt.c:864
-#: src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=语系           语系名称，必须是“语言”或“语言_国家”的格式\n"
 
-#: src/msgfmt.c:830
+#: src/msgfmt.c:963
 #, c-format
-msgid "      --source                produce a .java file, instead of a .class file\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
 msgstr "      --source                生成 .java 文件，而非 .class 文件\n"
 
-#: src/msgfmt.c:832
+#: src/msgfmt.c:965
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目录                     类目录层次的基本目录\n"
 
-#: src/msgfmt.c:834
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "-d 选项是必须的。class 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:840
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:846 src/msgunfmt.c:474
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
 msgstr "  -d 目录                     依赖语系的 .dll 文件的的基本目录\n"
 
-#: src/msgfmt.c:848
+#: src/msgfmt.c:981
 #, 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 "-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录，而子目录的名称取决于语系。\n"
+msgstr ""
+"-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录，而子目录的名称取决于"
+"语系。\n"
 
-#: src/msgfmt.c:852
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:856 src/msgunfmt.c:484
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d DIRECTORY                    .msg 消息库的基本目录\n"
 
-#: src/msgfmt.c:858
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:862
+#: src/msgfmt.c:995
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "桌面访问模式选项:\n"
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:1001
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         .desktop 文件用作模版\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                    .po文件的基本目录\n"
 
-#: src/msgfmt.c:872 src/xgettext.c:991
+#: src/msgfmt.c:1005 src/xgettext.c:1110
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -1885,40 +2136,59 @@ msgstr ""
 "  -kWORD, --keyword=WORD      查找 WORD 作为一个额外的关键字\n"
 "  -k, --keyword               不使用默认关键字\n"
 
-#: src/msgfmt.c:875
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
 #, c-format
 msgid ""
-"The -l, -o, and --template options are mandatory.  If -D is specified, input\n"
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 "-l，-o 及--temmplate 选项是必须的。若指定了-D，\n"
 "则输入文件从目录读取，而非命令行参数。\n"
 
-#: src/msgfmt.c:887 src/xgettext.c:954
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr "XML 模式选项：\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr "  -L, --language=NAME         识别指定的 XML 语言\n"
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr "  --template=TEMPLATE         将指定的 XML 文件用作模板\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "输入文件的处理:\n"
+msgstr "输入文件的处理：\n"
 
-#: src/msgfmt.c:889
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
 "  -c, --check                 同时进行 --check-format、--check-header 和\n"
 "                                --check-domain 三种检查\n"
 
-#: src/msgfmt.c:892
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
-#: src/msgfmt.c:894
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr "      --check-header          检查文件头项是否存在及检查其内容\n"
 
-#: src/msgfmt.c:896
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1927,137 +2197,139 @@ msgstr ""
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是否冲突\n"
 
-#: src/msgfmt.c:899
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
 
-#: src/msgfmt.c:901
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
-msgstr "      --check-accelerators[=CHAR]  检查菜单项目中的快捷键标记是否存在\n"
+msgstr ""
+"      --check-accelerators[=CHAR]  检查菜单项目中的快捷键标记是否存在\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgfmt.c:909
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=数字        以<数字>个字节为单位对齐字符串(默认：%d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=数字        以<数字>个字节为单位对齐字符串(默认：%d)\n"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
 "      --endianness=BYTEORDER  以指定字节序输出 32位数\n"
 "                                (big 还是 little 是系统平台默认的)\n"
 
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               二进制文件将不包含哈希表\n"
 
-#: src/msgfmt.c:923
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:925 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:1038
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转换无法工作\n"
 
-#: src/msgfmt.c:1051
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "警告：PO 文件头模糊\n"
-
-#: src/msgfmt.c:1053
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
-
-#: src/msgfmt.c:1077
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域名“%s”无法用于文件名"
 
-#: src/msgfmt.c:1082
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域名“%s”无法用于文件名：将使用前缀"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1230
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "忽略了“domain %s”命令"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1290
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "忽略了空的“msgstr”项"
 
-#: src/msgfmt.c:1157
+#: src/msgfmt.c:1291
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr”项"
 
-#: src/msgfmt.c:1206
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
-#: src/msgfmt.c:1324
+#: src/msgfmt.c:1455
 #, c-format
 msgid "%s does not exist"
 msgstr "%s 不存在"
 
-#: src/msgfmt.c:1335
+#: src/msgfmt.c:1462
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s 存在但不可读"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:566
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:164 src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176
-#: src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/msggrep.c:502
+#: src/msggrep.c:501
 #, c-format
-msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
+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:522
+#: src/msggrep.c:521
 #, 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:548
+#: src/msggrep.c:547
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2131,31 +2403,38 @@ msgstr ""
 "  -i, --ignore-case           忽略大小写区别\n"
 "  -v, --invert-match          仅输出不符合任何条件的消息\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr "      --escape                在输出中使用 C 转义字符，没有扩展字符\n"
 
-#: src/msggrep.c:624
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           生成排序输出\n"
 
-#: src/msggrep.c:626
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根据文件位置排序输出\n"
 
-#: src/msginit.c:298
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
 "系统环境没有任何和语言有关的设置。请根据 ABOUT-NLS 文件所述，\n"
 "设置 LANG 环境变量。这是测试翻译前的必要步骤。\n"
 
-#: src/msginit.c:322
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2166,57 +2445,61 @@ msgstr ""
 "请通过 --locale 选项指定语系或\n"
 "--output-file 选项指定输出的 .po 文件。\n"
 
-#: src/msginit.c:348
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "已创建 %s。\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:371
 #, 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:378
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=输入文件        输入的 POT 文件\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "如果没有给出输入文件，将会搜索当前目录中的 POT 文件。\n"
 "如果为 - 的话，将会读取标准输入。\n"
 
-#: src/msginit.c:386
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=文件      将输出写入至指定的 PO 文件\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:391
 #, 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 ""
-"如果没有指定输出文件，输出文件的名称将会由 --locale 选项或者用户的语系决定。\n"
+"如果没有指定输出文件，输出文件的名称将会由 --locale 选项或者用户的语系决"
+"定。\n"
 "如果输出文件是“-”，则会将结果写入至标准输出。\n"
 
-#: src/msginit.c:401
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
 msgstr "  -l, --locale=LL_CC          设置目标语系\n"
 
-#: src/msginit.c:403
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假定 PO 文件是自动生成的\n"
 
-#: src/msginit.c:469
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2224,12 +2507,12 @@ msgstr ""
 "找到多于一个的 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:477 src/msginit.c:482
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
 msgstr "读取当前的目录时发生错误"
 
-#: src/msginit.c:490
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2237,17 +2520,19 @@ msgstr ""
 "在当前目录中找不到任何 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
-#: src/msginit.c:1419 src/read-csharp.c:84 src/read-java.c:82
-#: src/read-resources.c:85 src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 子进程失败，错误码为 %d"
 
-#: src/msginit.c:1119
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
 "新的翻译库应该包含您的电子邮件地址，这样用户就可以对您的翻译提出意见，\n"
@@ -2256,44 +2541,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:1616
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 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:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "输入文件中出现了两种不同的字符集“%s”和“%s”"
 
-#: src/msgl-cat.c:204
+#: src/msgl-cat.c:203
 #, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "输入文件“%s”不包含指定字符集的文件头项"
 
-#: src/msgl-cat.c:208
+#: src/msgl-cat.c:207
 #, c-format
-msgid "domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
 msgstr "输入文件“%2$s”的域“%1$s”不包含指定字符集的文件头项"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目标字符集编码“%s”不是通用的编码名称。"
 
-#: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:554 src/xgettext.c:3532
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "警告："
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2302,17 +2590,18 @@ msgstr ""
 "输入文件所用的编码不同，其中包含 UTF-8。\n"
 "输出将转换为 UTF-8。\n"
 
-#: src/msgl-cat.c:452
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 "输入文件包含不同编码的消息，其中包含 %s 和 %s。会将输出的编码转换为 UTF-8。\n"
 "若要选择另一种输出编码，请使用 --to-code 选项。\n"
 
-#: src/msgl-cat.c:491
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2324,7 +2613,7 @@ msgstr ""
 "请将全部的 msgid 和 msgctxt 都转换为纯 ASCII，或者从源代码上保证这些字符串\n"
 "都是 UTF-8 编码的。\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2335,12 +2624,12 @@ msgstr ""
 "当前语系的字符集“%s”和输入文件的字符集“%s”不同。\n"
 "“%s”的输出可能有误。可行的解决方法包含：\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:99
 #, 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:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2351,7 +2640,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2364,7 +2653,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2375,71 +2664,75 @@ msgstr ""
 "“%s”的输出可能有误。\n"
 "设置 LC_ALL=C 是一个可行的解决方法。\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "复数表达式将导致负值"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但复数表达式的最大值可能等于 %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "复数表达式将导致被零除"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "复数表达式将引起整数溢出"
 
-#: src/msgl-check.c:202
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
 msgstr "复数表达式将引起算术异常，可能被零除"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "请尝试使用下面的，对 %s 是有效的："
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "消息库有复数形式的翻译"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "但是文件头项中缺少“plural=表达式”属性"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "但是文件头项中缺少“nplural=整数”属性"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals 值无效"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural 表达式无效"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, 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:495
+#: src/msgl-check.c:494
 #, 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:519
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 "翻译库包含复数形式的翻译，但缺少以下的文件头项：\n"
 "“Plural-Forms: nplurals=<整数>; plural=<表达式>;”"
@@ -2448,7 +2741,7 @@ msgstr ""
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "“msgid”和“msgid_plural”项并非都以“\\n”开始"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "“msgid”和“msgstr[%u]”项并非都以“\\n”开始"
@@ -2461,7 +2754,7 @@ msgstr "“msgid”和“msgstr”项并非都以“\\n”开始"
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "“msgid”和“msgid_plural”项并非都以“\\n”结束"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "“msgid”和“msgstr[%u]”项并非都以“\\n”结束"
@@ -2474,83 +2767,94 @@ msgstr "“msgid”和“msgstr”项并非都以“\\n”结束"
 msgid "plural handling is a GNU gettext extension"
 msgstr "复数处理是 GNU gettext 的扩展功能"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少快捷键标记“%c”"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包含过多的快捷键标记“%c”"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "文件头“%s”仍然是默认值未改变\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "头部缺少文件头“%s”\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
-msgstr "ASCII 省略号('...')代替了Unicode "
+msgstr "ASCII 省略号（'...'）而非其 Unicode 版本"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "在用户可见字符串中的省略号前发现了空格"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1041
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII 双引号代替了Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1047
 msgid "ASCII single quote used instead of Unicode"
 msgstr "ASCII 单引号代替了Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII 圆点（'%c'）而非其 Unicode 版本"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s：在“%s”编码中输入无效"
 
-#: src/msgl-iconv.c:70
+#: 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:291
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件不包含指定字符集的文件头项"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/x-python.c:666 src/xgettext.c:751
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
 msgstr "无法从“%s”转换为“%s”。%s 需要 iconv()，但 iconv() 不支持此种转换方式。"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
 msgstr "从“%s”转换为“%s”出现了重复项：某些原本不同的 msgid 变成了相同项。"
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/x-python.c:673
-#: src/xgettext.c:758
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+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:406 src/msgmerge.c:412
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:508
 msgid "backup type"
 msgstr "备份类型"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2571,24 +2875,24 @@ msgstr ""
 "在程序执行的过程中找不到完全匹配的文字，则会使用模糊的匹配以求达到较好的\n"
 "效果。\n"
 
-#: src/msgmerge.c:521
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      根据旧源文件进行的翻译成果\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     对新源文件的引用\n"
 
-#: src/msgmerge.c:527
+#: src/msgmerge.c:568
 #, 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:533
+#: src/msgmerge.c:574
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2597,30 +2901,31 @@ msgstr ""
 "  -U, --update                更新 def.po,\n"
 "                              如果 def.po 已经是最新则不作任何事\n"
 
-#: src/msgmerge.c:545
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "以更新模式输出文件位置：\n"
 
-#: src/msgmerge.c:547
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "结果将写回 def.po 中。\n"
 
-#: src/msgmerge.c:549
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=备份方法       备份 def.po\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=后缀           覆盖默认备份后缀\n"
 
-#: src/msgmerge.c:553
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2634,133 +2939,156 @@ msgstr ""
 "  existing, nil   如果编号备份存在则继续编号，否则执行简单备份\n"
 "  simple, never   总是制作简单的备份\n"
 
-#: src/msgmerge.c:560
+#: src/msgmerge.c:601
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
-msgstr "除非以 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置, 备份文件后缀总是\"~\"\n"
+msgstr ""
+"除非以 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置, 备份文件后缀总是\"~\"\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:610
+#, fuzzy, c-format
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 识别 Boost 格式字符串\n"
+
+#: src/msgmerge.c:615
 #, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
 msgstr "      --previous              保留已翻译条目的 msgids\n"
 
-#: src/msgmerge.c:628 src/urlget.c:193
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隐藏进度指示\n"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此消息应定义复数形式"
 
-#: src/msgmerge.c:1650
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此消息不应定义复数形式"
 
-#: src/msgmerge.c:2053
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
-msgstr "%s读取了 %ld 条旧的 + %ld 条引用，合并了 %ld 条，模糊的 %ld 条，缺少 %ld 条，过时的 %ld 条。\n"
+msgid ""
+"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
+"obsolete %ld.\n"
+msgstr ""
+"%s读取了 %ld 条旧的 + %ld 条引用，合并了 %ld 条，模糊的 %ld 条，缺少 %ld 条，"
+"过时的 %ld 条。\n"
 
-#: src/msgmerge.c:2061 src/urlget.c:307 src/urlget.c:354 src/urlget.c:396
-#: src/urlget.c:438
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: src/msgunfmt.c:309 src/msgunfmt.c:318 src/msgunfmt.c:341
+#: 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:428
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "用法：%s [选项] [文件]...\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "将二进制消息库转换为 Uniforum 风格的 .po 文件。\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
 msgstr "  -j, --java                  Java 模式：输入为 Java 资源包类\n"
 
-#: src/msgunfmt.c:443
+#: 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:445
+#: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C# 资源模式：输入为 .NET .resources 文件\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# 资源模式：输入为 .NET .resources 文件\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:446
 #, c-format
-msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  文件 ...                    输入的 .mo 文件\n"
 
-#: src/msgunfmt.c:457
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "以 Java 模式输入文件位置：\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "类会使用 CLASSPATH 定位。\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:476
+#: 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 "-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语系。\n"
+msgstr ""
+"-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语"
+"系。\n"
 
-#: src/msgunfmt.c:480
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:486
+#: 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:512
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                写出缩进的输出风格\n"
 
-#: src/msgunfmt.c:514
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                写出严格的 Uniforum 风格\n"
 
-#: src/msguniq.c:332
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2779,17 +3107,19 @@ msgstr ""
 "累积起来，但如果指定了 --use-first 选项，则会从第一个翻译中取得注释。文件位置\n"
 "将会累积。如果使用了 --unique 选项，重复项将会被忽略。\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只打印重复项\n"
 
-#: src/msguniq.c:367
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
 msgstr "  -u, --unique                只打印唯一的消息，忽略重复项\n"
 
-#: src/open-catalog.c:57 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>"
@@ -2820,7 +3150,7 @@ msgstr "安装 GNU libiconv，然后重新安装 GNU gettext 将修复此问题�
 
 #: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
-msgstr "仍然继续，遇到处理错误。"
+msgstr "仍然继续，预期会出现解析错误。"
 
 #: src/po-charset.c:580
 msgid "Continuing anyway."
@@ -2848,27 +3178,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "#~ 使用不一致"
 
-#: src/po-gram-gen.y:244
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "缺少“msgstr[]”区"
 
-#: src/po-gram-gen.y:253
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "缺少“msgid_plural”区"
 
-#: src/po-gram-gen.y:261
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "缺少“msgstr”区"
 
-#: src/po-gram-gen.y:400
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "复数格式的第一项索引非零"
 
-#: src/po-gram-gen.y:402
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "复数形式的索引出错"
@@ -2878,7 +3208,7 @@ msgstr "复数形式的索引出错"
 msgid "too many errors, aborting"
 msgstr "错误太多，中止"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:813 src/write-po.c:951
+#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "无效的多字节序列"
@@ -2888,41 +3218,41 @@ msgstr "无效的多字节序列"
 msgid "incomplete multibyte sequence at end of file"
 msgstr "在文件尾发现不完整的多字节序列"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "在行尾发现不完整的多字节序列"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv 失败"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "关键字“%s”未知"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
 msgstr "无效的控制序列"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "字符串内遇到文件尾"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
 msgstr "字符串内遇到行尾"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:325 src/xgettext.c:1103
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
@@ -2935,52 +3265,85 @@ msgstr "重复的消息定义"
 msgid "this is the location of the first definition"
 msgstr "这是第一次定义的位置"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr "未终止的组名称"
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr "无效的非空白字符"
+
+#: src/read-desktop.c:405
+#, c-format
+msgid "missing '=' after \"%s\""
+msgstr "“%s”后缺少“=”"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "无效的非空白行"
+
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "文件“%s”被截断"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "文件“%s”包含非 NUL 结束的字符串"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "文件“%s”包含非 NUL 结束的字符串"
+
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "文件“%s”不是 GNU .mo 格式"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "文件“%s”包含非 NUL 结尾的字符串，位于 %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "警告：Unicode 字符语法 \\uxxxx 无效"
 
-#: src/read-stringtable.c:803
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: 警告:未结束的字符串 U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "警告：无效的 Unicode 字符"
+
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "警告：未结束的字符串"
 
 # c-format
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "警告：语法错误"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "警告：未结束的关键字/值对"
 
 #: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
-msgstr "警告：语法错误，字符串后期待“;”"
+msgstr "警告：语法错误，字符串后预期有“;”"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "警告：语法错误，字符串后期待“=”或“;”"
+msgstr "警告：语法错误，字符串后预期有“=”或“;”"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:115
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "由 %s 和 %s 编写。\n"
@@ -2989,153 +3352,169 @@ msgstr "由 %s 和 %s 编写。\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "将塞尔维亚语由西里尔文转换为拉丁文。\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr "输入文本从标准输入读取。转换后的文本输出到标准输出。\n"
 
-#: src/recode-sr-latin.c:340
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "输入无法用“%s”编码表示"
 
-#: src/recode-sr-latin.c:368
+#: src/recode-sr-latin.c:363
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "从“%s”转换为“%s”编码时出错"
 
-#: src/urlget.c:160
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
 msgstr "需要两个参数"
 
-#: src/urlget.c:177
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "用法：%s [选项] URL 文件\n"
 
-#: src/urlget.c:182
+#: src/urlget.c:180
 #, 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 "获取 URL 并输出其内容。如果无法访问 URL，则换用指定的本地文件。\n"
 
-#: src/urlget.c:229
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/urlget.c:235
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
 msgstr "写入 stdout 出错"
 
-#: src/urlget.c:239
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "读取“%s”后出错"
 
-#: src/urlget.c:265
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
 msgstr "取回 %s..."
 
-#: src/urlget.c:309
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
 msgstr "超时。\n"
 
-#: src/urlget.c:446
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
 msgstr "失败。\n"
 
-#: src/write-catalog.c:127
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "无法通过指定输出格式，将多个待译稿输出为单个文件。试着用 PO 文件语法代替。"
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"无法通过指定输出格式，将多个待译稿输出为单个文件。试着用 PO 文件语法代替。"
 
-#: src/write-catalog.c:130
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
 msgstr "无法通过指定输出格式，将多个待译稿输出为单个文件。"
 
-#: src/write-catalog.c:163
-msgid "message catalog has context dependent translations, but the output format does not support them."
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
 msgstr "消息库有依赖上下文的翻译，但是输出格式不支持上下文。"
 
-#: src/write-catalog.c:198
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "消息库有复数翻译，但输出格式不支持复数。试着使用“msgfmt --java”生成 Java 类，而不是 properties 文件。"
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"消息库有复数翻译，但输出格式不支持复数。试着使用“msgfmt --java”生成 Java 类，"
+"而不是 properties 文件。"
 
-#: src/write-catalog.c:203
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr "消息库有复数翻译，但是输出格式不支持复数处理。"
 
-#: src/write-catalog.c:232 src/write-catalog.c:276
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "无法创建输出文件“%s”"
 
-#: src/write-catalog.c:240 src/write-catalog.c:284
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "标准输出"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "创建目录“%s”失败"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "编译 C# 类失败，试试 --verbose"
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:773
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "编译 C# 类失败"
 
-#: src/write-java.c:1092
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "打开“%s”写入出错"
+
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "不是有效的 Java 类名：%s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC 变量"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1219
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "打开“%s”写入出错"
-
-#: src/write-po.c:822
+#: src/write-po.c:821
 msgid "incomplete multibyte sequence"
 msgstr "不完整的多字节序列"
 
-#: src/write-po.c:885
+#: src/write-po.c:884
 #, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
 msgstr "国际化的消息不应包含“\\%c”转码序列"
 
-#: src/write-po.c:1336 src/write-po.c:1460
+#: src/write-po.c:1334 src/write-po.c:1502
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3148,7 +3527,7 @@ msgstr ""
 "用纯 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:1348 src/write-po.c:1472
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3171,11 +3550,13 @@ msgstr ""
 
 #: src/write-qt.c:694
 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 的字符，但 Qt 消息库格式仅在翻译\n"
+"消息库中的 msgctxt 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻"
+"译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
 #: src/write-qt.c:718
@@ -3187,12 +3568,12 @@ msgstr ""
 "消息库中的 msgid 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "写入 %s 子进程出错"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3200,7 +3581,7 @@ msgstr ""
 "消息库有依赖上下文的翻译\n"
 "但是 C# .resources 格式不支持上下文\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3208,7 +3589,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 C# .resources 格式不支持复数处理\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3216,7 +3597,7 @@ msgstr ""
 "消息库有依赖上下文的翻译\n"
 "但是 Tcl 消息库不支持上下文\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3224,36 +3605,56 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结束的字符串"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1153
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr "警告：无效的 Unicode 字符"
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d：警告：无效的 Unicode 字符"
 
-#: src/x-c.c:1464 src/x-csharp.c:1510 src/x-java.c:872 src/x-vala.c:619
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d：警告：未结束的字符串字面"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d：警告：未结束的字符串字面"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d：警告：未结束的字符串字面"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d：警告：未结束的字符常量"
 
-#: src/x-c.c:1520 src/x-c.c:1571 src/x-vala.c:729
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结束的字符串字面"
 
-#: src/x-csharp.c:225 src/xgettext.c:2168
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
 msgstr "请用 --from-code 指定源编码"
 
-#: src/x-csharp.c:270
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3262,7 +3663,7 @@ msgstr ""
 "%s:%d：出现了无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:286
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3271,7 +3672,7 @@ msgstr ""
 "%s:%d：较长的不完整多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:298
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3280,7 +3681,7 @@ msgstr ""
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:307
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3289,12 +3690,12 @@ msgstr ""
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
 
-#: src/x-csharp.c:339
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3303,330 +3704,135 @@ msgstr ""
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d：警告：无效的 Unicode 字符"
-
-#: src/x-csharp.c:1513 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d：警告：未结束的字符串常量"
 
-#: src/x-csharp.c:2019 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d：警告：期待“}”却发现了“)”"
+msgstr "%s:%d：警告：预期为“}”却得到了“)”"
 
-#: src/x-csharp.c:2053 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d：警告：期待“)”却发现了“}”"
-
-#: src/x-glade.c:296
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr "从元素“%s”中解开的字符串缺少上下文"
-
-#: src/x-glade.c:418
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr "在有效的Glade 文件中根元素<%s> 不允许"
-
-#: src/x-glade.c:573 src/x-glade.c:580
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%lu:%lu：%s"
-
-#: src/x-glade.c:607
-#, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"不支持“glade”。%s 依赖 expat。\n"
-"此版本创建时未包含 expat。\n"
+msgstr "%s:%d：警告：预期为“)”却得到了“}”"
 
-#: src/x-java.c:494
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: 警告:未结束的字符串 U+%04X"
-
-#: src/x-javascript.c:231
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "请用 --from-code 指定源编码\n"
-
-#: src/x-javascript.c:276
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：出现了无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码\n"
-
-#: src/x-javascript.c:292
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\n"
-msgstr ""
-"%s:%d：较长的不完整多字节序列。\n"
-"请通过 --from-code 指定源文件的编码\n"
-
-#: src/x-javascript.c:304
-#, 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:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码\n"
-
-#: src/x-javascript.c:313
-#, 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:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码\n"
-
-#: src/x-javascript.c:345
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-msgstr ""
-"%s:%d：无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码\n"
-
-#: src/x-javascript.c:955
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d：警告：RegExp 正则表达式过早结束"
-
-#: src/x-javascript.c:1056
-#, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d：警告：不准用%s"
-
-#: src/x-javascript.c:1070
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d：警告：未结束的XML 标记"
-
-#: 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:1043
-#, c-format
-msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d：在 \\x{十六进制数} 处缺少右大括号"
-
-#: 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:1183
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d：8位字符“%c”转义无效(“\\u”)"
-
-#: src/x-perl.c:1217
-#, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d：“%c”处有无效的变量转义"
-
-#: 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:1247
-#, c-format
-msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
-
-#: src/x-python.c:279
-msgid ""
-"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 ""
-"请通过 --from-code 或是注释指定源文件的编码，\n"
-"如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
-
-#: src/x-python.c:325
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d：出现了无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码，详见\n"
-"http://www.python.org/peps/pep-0263.html。\n"
-
-#: src/x-python.c:342
-#, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d：较长的不完整多字节序列。\n"
-"请通过 --from-code 指定源文件的编码，详见\n"
-"http://www.python.org/peps/pep-0263.html。\n"
-
-#: src/x-python.c:355
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of file.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码，详见\n"
-"http://www.python.org/peps/pep-0263.html。\n"
-
-#: src/x-python.c:365
-#, c-format
-msgid ""
-"%s:%d: Incomplete multibyte sequence at end of line.\n"
-"Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码，详见\n"
-"http://www.python.org/peps/pep-0263.html。\n"
-
-#: src/x-python.c:398
-#, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\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:%d：无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码，详见\n"
-"http://www.python.org/peps/pep-0263.html。\n"
-
-#: src/x-python.c:723
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr "未知编码“%s”。先按照 ASCII 处理。"
-
-#: src/x-rst.c:109
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr "%s:%d：无效的字符串定义"
-
-#: src/x-rst.c:173
-#, c-format
-msgid "%s:%d: missing number after #"
-msgstr "%s:%d：# 后面丢失数字"
-
-#: src/x-rst.c:208
-#, c-format
-msgid "%s:%d: invalid string expression"
-msgstr "%s:%d：无效的字符串表达式"
-
-#: src/x-sh.c:1075
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
-
-#: src/x-vala.c:414
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d：警告：正则表达式过早终止"
-
-#: src/xgettext.c:555
+#: src/xgettext.c:567
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "“%s”不是个有效的编码名。正使用ASCII 作为替换。\n"
 
-#: src/xgettext.c:624
+#: src/xgettext.c:637
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "语法检查“%s”未知"
 
-#: src/xgettext.c:633
+#: src/xgettext.c:646
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "句子结尾类型“%s”未知"
 
-#: src/xgettext.c:679
+#: src/xgettext.c:701
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:684
+#: src/xgettext.c:705
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
 #: src/xgettext.c:839
 #, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr "警告：ITS 规则文件“%s”不存在"
+
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr "警告：ITS 规则文件“%s”不存在；请检查您的 gettext 安装情况"
+
+#: src/xgettext.c:938
+#, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "警告：文件“%s”扩展名“%s”未知; 将试试 C"
+msgstr "警告：文件“%s”扩展名“%s”未知; 将尝试 C"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:1027
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:931
+#: src/xgettext.c:1050
 #, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
+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:933
+#: src/xgettext.c:1052
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:1054
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgid ""
+"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:940
+#: src/xgettext.c:1059
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:942
-#, c-format
+#: src/xgettext.c:1061
+#, fuzzy, c-format
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "  -L, --language=NAME         识别指定的语言\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:1068
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:951
+#: src/xgettext.c:1070
 #, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
+msgid ""
+"By default the language is guessed depending on the input file name "
+"extension.\n"
 msgstr "默认情况下，所使用的语言是根据输入文件的扩展名猜测的。\n"
 
-#: src/xgettext.c:956
+#: src/xgettext.c:1075
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3635,27 +3841,28 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:959
+#: src/xgettext.c:1078
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:1083
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:1085
 #, 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:968
+#: src/xgettext.c:1087
 #, c-format
 msgid ""
 "  -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"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cTAG, --add-comments=TAG   以 TAG 开始放置注释块\n"
@@ -3663,18 +3870,20 @@ msgstr ""
 "  -c, --add-comments          在输出文件中以关键词开启一行，\n"
 "                              并放置所有注释块\n"
 
-#: src/xgettext.c:973
+#: src/xgettext.c:1092
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            对信息文本做语法检查\n"
-"                                (Unicode省略号ellipsis-unicode, 空格加省略号space-ellipsis,\n"
-"                                 Unicode引号quote-unicode)\n"
+"                                （Unicode省略号ellipsis-unicode、空格加省略号"
+"space-ellipsis、\n"
+"                                 Unicode引号quote-unicode、Unicode圆点bullet-"
+"unicode）\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:1096
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3685,247 +3894,675 @@ msgstr ""
 "                                (默认单空格single-space \n"
 "                                 或双空格double-space)\n"
 
-#: src/xgettext.c:982
+#: src/xgettext.c:1101
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项:\n"
 
-#: src/xgettext.c:984
+#: src/xgettext.c:1103
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:986
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (仅支持 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:994
+#: src/xgettext.c:1113
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 "                                (仅支持 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:999
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
 "      --flag=WORD:ARG:FLAG    在关键字WORD 的参数个数ARG 中\n"
 "                              字符串的额外flag\n"
 
-#: src/xgettext.c:1002
+#: src/xgettext.c:1121
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (仅支持 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1007
+#: src/xgettext.c:1126
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:1009
+#: src/xgettext.c:1128
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅支持 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:1011
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=文件              读取指定<文件>并应用其中的 ITS 规则\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                （仅支持基于 XML 的语言）\n"
+
+#: src/xgettext.c:1134
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:1013 src/xgettext.c:1017 src/xgettext.c:1021
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:1015
+#: src/xgettext.c:1138
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:1142
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:1023
+#: src/xgettext.c:1146
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:1048
+#: src/xgettext.c:1171
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:1063
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --itstool               输出 itstool 注释\n"
+
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:1065
+#: src/xgettext.c:1190
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:1067
+#: src/xgettext.c:1192
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:1069
+#: src/xgettext.c:1194
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:1071
+#: src/xgettext.c:1196
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  设置报告 msgid 错误的地址\n"
 
-#: src/xgettext.c:1073
+#: src/xgettext.c:1198
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
 "                                values\n"
 msgstr ""
 "  -m[STRING], --msgstr-prefix[=STRING]  使用 STRING 或 \"\" 作为\n"
 "                                         msgstr 内容的前缀\n"
 
-#: src/xgettext.c:1076
+#: src/xgettext.c:1201
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
 "                                values\n"
-msgstr "  -M[STRING], --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
+msgstr ""
+"  -M[STRING], --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后"
+"缀\n"
 
-#: src/xgettext.c:1902
+#: src/xgettext.c:1597
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:2027
+#: src/xgettext.c:1695
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:2133
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
+msgstr ""
+"未指定选项 --msgid-bugs-address。\n"
+"如果您正在使用“Makevars”文件，请指定\n"
+" MSGID_BUGS_ADDRESS 变量；\n"
+"否则，请指定 --msgid-bugs-address 命令行选项。\n"
+
+#: src/xgettext.c:2088
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr "%s%s 处有非 ASCII 码字符。"
+msgid "language '%s' unknown"
+msgstr "语言“%s”未知"
 
-#: src/xgettext.c:2137
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "请用 --from-code 指定源编码\n"
+
+#: src/x-javascript.c:275
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d：出现了无效的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码\n"
 
-#: src/xgettext.c:2142
+#: src/x-javascript.c:291
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr "%s%s 处有非 ASCII 字符串。"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d：较长的不完整多字节序列。\n"
+"请通过 --from-code 指定源文件的编码\n"
 
-#: src/xgettext.c:2248 src/xgettext.c:2281 src/xgettext.c:2346
+#: src/x-javascript.c:303
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s：警告："
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码\n"
 
-#: src/xgettext.c:2251
+#: src/x-javascript.c:312
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码\n"
 
-#: src/xgettext.c:2252
+#: src/x-javascript.c:344
 #, 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"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d：无效的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码\n"
+
+#: src/x-javascript.c:919
+#, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d：警告：RegExp 正则表达式过早结束"
+
+#: src/x-javascript.c:1027
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d：警告：不允许使用 %s"
+
+#: src/x-javascript.c:1041
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d：警告：未终止的 XML 标记"
+
+#: src/x-perl.c:339
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr "%s:%d：在文件结束符前的任何位置都找不到字符串结束符“%s”"
 
-#: src/xgettext.c:2283
+#: src/x-perl.c:1074
 #, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d：在 \\x{十六进制数} 处缺少右大括号"
+
+#: src/x-perl.c:1195
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d：8位字符“%c”转义无效(“\\l”)"
+
+#: src/x-perl.c:1215
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr "%s:%d：8位字符“%c”转义无效(“\\u”)"
+
+#: src/x-perl.c:1249
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d：“%c”处有无效的变量转义"
+
+#: src/x-perl.c:1262
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr "%s:%d：8位字符“%c”转义无效(“\\L”)"
+
+#: src/x-perl.c:1279
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
+
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"带有未命名参数的“%s”格式字符串无法正确本地化：\n"
-"翻译者无法重新编排参数的顺序。\n"
-"请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
+"请通过 --from-code 或是注释指定源文件的编码，\n"
+"如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
+
+#: src/x-python.c:325
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d：出现了无效的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
+
+#: src/x-python.c:342
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d：较长的不完整多字节序列。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
+
+#: src/x-python.c:355
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+msgid ""
+"%s:%d: Incomplete multibyte sequence at end of file.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/xgettext.c:2348
+#: src/x-python.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
-"Empty msgid.  It is reserved by GNU gettext:\n"
-"gettext(\"\") returns the header entry with\n"
-"meta information, not the empty string.\n"
+"%s:%d: Incomplete multibyte sequence at end of line.\n"
+"Please specify the correct source encoding through --from-code or through a\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
+msgstr ""
+"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
+
+#: src/x-python.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code or through a comment\n"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"空的 msgid，由 GNU gettext 保留：\n"
-"gettext(\"\") 将返回文件头项，而不\n"
-"是空字符串。\n"
+"%s:%d：无效的多字节序列。\n"
+"请通过 --from-code 指定源文件的编码，详见\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/xgettext.c:3085
+#: src/x-python.c:654
 #, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "关键字“%.*s”的参数指定含糊"
+msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
+msgstr "未知编码“%s”。先按照 ASCII 处理。"
 
-#: src/xgettext.c:3112
+#: src/x-rst.c:116
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr "警告：关键字“%.*s”缺少上下文"
+msgid "%s:%d: invalid string definition"
+msgstr "%s:%d：无效的字符串定义"
 
-#: src/xgettext.c:3137
+#: src/x-rst.c:180
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "警告：关键字“%.*s”缺少复数参数上下文"
+msgid "%s:%d: missing number after #"
+msgstr "%s:%d：# 后面缺失数字"
 
-#: src/xgettext.c:3158
+#: src/x-rst.c:215
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr "单数和复数的上下文不匹配"
+msgid "%s:%d: invalid string expression"
+msgstr "%s:%d：无效的字符串表达式"
 
-#: src/xgettext.c:3533
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d：无效的字符串定义"
+
+#: src/x-rst.c:683
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d：无效的字符串定义"
+
+#: src/x-rst.c:691
+#, c-format
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
 msgstr ""
-"未指定选项 --msgid-bugs-address。\n"
-"如果您正在使用“Makevars”文件，请指定\n"
-" MSGID_BUGS_ADDRESS 变量；\n"
-"否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3753
+#: src/x-sh.c:1101
 #, c-format
-msgid "language '%s' unknown"
-msgstr "语言“%s”未知"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
+
+#: src/x-vala.c:616
+#, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d：警告：正则表达式过早终止"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<未命名>"
 
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "无效的 UTF-8 序列"
+
+#: libgettextpo/markup.c:377
+#, c-format
+msgid "'%s' is not a valid name: %c"
+msgstr "“%s”不是有效的名称：%c"
+
+#: libgettextpo/markup.c:397
+#, c-format
+msgid "'%s' is not a valid name: '%c'"
+msgstr "“%s”不是有效的名称：“%c”"
+
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
+#, c-format
+msgid "invalid character reference: %s"
+msgstr "无效的字符引用：%s"
+
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr "并非有效的数字规格"
+
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr "没有结尾的“;”"
+
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr "不允许的字符"
+
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr "（空）"
+
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr "未知"
+
+#: libgettextpo/markup.c:608
+#, c-format
+msgid "invalid entity reference: %s"
+msgstr "无效的实体引用：%s"
+
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr "文档必须以一个元素起始"
+
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
+#, c-format
+msgid "invalid character after '%s'"
+msgstr "“%s”后的无效字符"
+
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
+#, c-format
+msgid "missing '%c'"
+msgstr "缺少“%c”"
+
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
+#, c-format
+msgid "missing '%c' or '%c'"
+msgstr "缺少“%c”或“%c”"
+
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr "闭合元素名称"
+
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr "元素已闭合"
+
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr "空文档"
+
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr "在“<”之后"
+
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr "元素未闭合"
+
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr "缺少“>”"
+
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr "在元素名中"
+
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "在属性名中"
+
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr "在未闭合标签中"
+
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr "“=”后"
+
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr "在属性值中"
+
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr "在闭合标签中"
+
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr "在注释或处理指令中"
+
+#: libgettextpo/markup.c:1548
+#, c-format
+msgid "document ended unexpectedly: %s"
+msgstr "文档意外结束：%s"
+
+#, c-format
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: 选项“--%s”不允许有参数\n"
+
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: 无法识别的选项“--%s”\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: 选项“-W %s”歧义\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: 选项“-W %s”不允许参数\n"
+
+#, c-format
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: 选项“-W %s”需要参数\n"
+
+#, c-format
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "警告：PO 文件头模糊\n"
+
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
+
+#, c-format
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "%s%s 处有非 ASCII 码字符。"
+
+#, c-format
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
+
+#, c-format
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "%s%s 处有非 ASCII 字符串。"
+
+#, c-format
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s：警告："
+
+#, c-format
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
+
+#, 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"
+
+#, c-format
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "带有未命名参数的“%s”格式字符串无法正确本地化：\n"
+#~ "翻译者无法重新编排参数的顺序。\n"
+#~ "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
+
+#~ 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 ""
+#~ "空的 msgid，由 GNU gettext 保留：\n"
+#~ "gettext(\"\") 将返回文件头项，而不\n"
+#~ "是空字符串。\n"
+
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "关键字“%.*s”的参数指定含糊"
+
+#, c-format
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "警告：关键字“%.*s”缺少上下文"
+
+#, c-format
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr "警告：关键字“%.*s”缺少复数参数上下文"
+
+#, c-format
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "单数和复数的上下文不匹配"
+
+#~ msgid "Missing context for the string extracted from '%s' element"
+#~ msgstr "从元素“%s”中解开的字符串缺少上下文"
+
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu：%s"
+
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "不支持“glade”。%s 依赖 expat。\n"
+#~ "此版本创建时未包含 expat。\n"
+
 #~ msgid "header field '%s' should start at beginning of line\n"
 #~ msgstr "文件头项“%s”应该位于行首\n"
 
@@ -3949,11 +4586,14 @@ msgstr "<未命名>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "版权 (C) %s Free Software Foundation, Inc.\n"
-#~ "本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特定\n"
+#~ "本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特"
+#~ "定\n"
 #~ "用途也没有商用性或任何保全。\n"
 
 #~ msgid ""
diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index 0ae023127..47f5c0444 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -1,55 +1,64 @@
 # Traditional Chinese translation for gettext.
 # Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
+#
+# This translation are merged from Simplified Chinese, here is the contributor list:
+# Funda Wang <fundawang@linux.net.cn>, 2004.
+# Ji ZhengYu <zhengyuji@gmail.com>, 2015.
+# Boyuan Yang <073plan@gmail.com>, 2018.
+#
+# And the original translators:
 # Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
 # Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
 # Abel Cheung <abelcheung@gmail.com>, 2002, 2005.
 # Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
-#
+# pan93412 <pan93412@gmail.com>, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
-"PO-Revision-Date: 2013-09-03 13:00+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"POT-Creation-Date: 2019-04-13 11:21+0200\n"
+"PO-Revision-Date: 2019-01-29 17:14+0800\n"
+"Last-Translator: pan93412 <pan93412@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"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 18.12.1\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "%2$s 的引數 %1$s 無效"
+msgstr "%2$s 的參數 %1$s 無效"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "%2$s 的引數 %1$s 不明確"
+msgstr "%2$s 的參數 %1$s 不明確"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:154
 msgid "Valid arguments are:"
-msgstr "有效的引數為："
+msgstr "有效的參數為："
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "找不到暫存檔目錄，正嘗試設定 $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "無法根據目錄名稱樣式 %s 建立暫存檔目錄"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "無法刪除暫存檔 %s"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "無法刪除暫存目錄 %s"
@@ -58,147 +67,134 @@ msgstr "無法刪除暫存目錄 %s"
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:198
 #, c-format
 msgid "preserving permissions for %s"
-msgstr ""
+msgstr "正在保留 %s 的權限"
 
 # 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:194
+#: gnulib-lib/copy-file.c:175
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
 
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:179
 #, c-format
 msgid "cannot open backup file %s for writing"
-msgstr "無法開啟備份檔 %s 來寫入內容"
+msgstr "無法開啟備份檔 %s 寫入內容"
 
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:183
 #, c-format
 msgid "error reading %s"
 msgstr "讀取 %s 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:187
 #, c-format
 msgid "error writing %s"
 msgstr "寫入 %s 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:191
 #, c-format
 msgid "error after reading %s"
 msgstr "完成讀取 %s 後發生錯誤"
 
-#: 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
+#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:896
+#: src/msginit.c:971 src/msginit.c:1131 src/msginit.c:1230 src/msginit.c:1398
+#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73
+#: src/read-tcl.c:111 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() 失敗"
 
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
+#: gnulib-lib/csharpcomp.c:443
+#, fuzzy, c-format
+#| msgid "C# compiler not found, try installing pnet"
+msgid "C# compiler not found, try installing mono"
 msgstr "找不到 C# 編譯器，請安裝 pnet"
 
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr "找不到 C# virtual machine，請安裝 pnet"
+#: gnulib-lib/csharpexec.c:255
+#, fuzzy, c-format
+#| msgid "C# virtual machine not found, try installing pnet"
+msgid "C# virtual machine not found, try installing mono"
+msgstr "找不到 C# 虛擬機，請安裝 pnet"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:195
 msgid "Unknown system error"
-msgstr "系統出現不明錯誤"
+msgstr "系統出現未知錯誤"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
-#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258
+#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349
+#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364
 #, c-format
 msgid "%s subprocess failed"
-msgstr "%s 副行程發生錯誤"
-
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：選項 ‘%s’ 不明確；可能選項包括："
+msgstr "%s 子行程發生錯誤"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：選項 --%s 不可配合引數使用\n"
-
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:278
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s：選項 ‘%c%s’ 不可配合引數使用\n"
+#| msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:284
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s：選項 ‘%s’ 需要引數\n"
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s：選項「%s」不明確；可能選項包括："
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:319
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s：無法辨識 ‘--%s’ 選項\n"
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s：無法辨識「%c%s」選項\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:345
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s：無法辨識 ‘%c%s’ 選項\n"
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s：選項「%c%s」不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:360
 #, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s：選項「--%s」需要參數\n"
+
+#: gnulib-lib/getopt.c:621
+#, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s：選項無效 -- %c\n"
+msgstr "%s：選項無效 -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682
+#, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s：選項需要引數 -- %c\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s：選項 ‘-W %s’ 不明確\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：選項 ‘-W %s’ 不可配合引數使用\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項 ‘%s’ 需要引數\n"
+msgstr "%s：選項需要參數 -- '%c'\n"
 
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174
+#: gnulib-lib/javacomp.c:200
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgstr "compile_java_class 有無效的 source_version 參數"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+msgstr "compile_java_class 有無效的 target_version 參數"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145
+#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "無法建立 “%s”"
+msgstr "無法建立「%s」"
 
-#: 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
+#: gnulib-lib/javacomp.c:586 src/write-catalog.c:254 src/write-catalog.c:327
+#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161
+#: src/write-java.c:1202 src/write-mo.c:816 src/write-qt.c:753
+#: src/write-tcl.c:228 src/write-xml.c:76
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "當寫入檔案 %s 時發生錯誤"
+msgstr "當寫入檔案「%s」時發生錯誤"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2436
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變數"
@@ -206,51 +202,51 @@ msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變�
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "找不到 Java virtual machine，請安裝 gij 或是設定 $JAVA 環境變數"
+msgstr "找不到 Java 虛擬機，請安裝 gij 或是設定 $JAVA 環境變數"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:904 src/msginit.c:979
+#: src/msginit.c:1139 src/msginit.c:1406
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "%s 副行程輸出/輸入錯誤"
+msgstr "%s 子行程 I/O 錯誤"
 
-#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83
+#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:313
 #, c-format
 msgid "creation of threads failed"
-msgstr ""
+msgstr "建立行程失敗"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502
+#: src/msgexec.c:425
 #, c-format
 msgid "write to %s subprocess failed"
-msgstr "寫入至 %s 副行程時發生錯誤"
+msgstr "寫入至 %s 子行程時發生錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:366 gnulib-lib/pipe-filter-ii.c:545
 #, c-format
 msgid "read from %s subprocess failed"
-msgstr "由 %s 副行程讀入資料時出現錯誤"
+msgstr "由 %s 子行程讀入資料時出現錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:419
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "無法和 %s 副行程建立非專用的 I/O"
+msgstr "無法和 %s 子行程建立非專用的 I/O"
 
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:457
 #, c-format
 msgid "communication with %s subprocess failed"
-msgstr "和 %s 副行程溝通時出現錯誤"
+msgstr "和 %s 子行程溝通時出現錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:577
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 副行程已終止，錯誤碼為 %d"
+msgstr "%s 子行程已終止，錯誤碼為 %d"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
@@ -271,425 +267,658 @@ msgstr "%s 副行程已終止，錯誤碼為 %d"
 #. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:362
 msgid "`"
-msgstr ""
+msgstr "「"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:363
 msgid "'"
-msgstr ""
+msgstr "」"
 
 #: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
-msgstr ""
+msgstr "設定 %s 的權限"
 
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144
+#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268
 #, c-format
 msgid "cannot create pipe"
 msgstr "無法建立管線"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:49
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失敗"
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#: gnulib-lib/w32spawn.h:90
+#, c-format
 msgid "cannot restore fd %d: dup2 failed"
-msgstr "無法產生輸出檔 “%s”"
+msgstr "無法還原 fd %d：dup2 失敗"
 
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263
+#: gnulib-lib/wait-process.c:325
 #, c-format
 msgid "%s subprocess"
-msgstr "%s 副行程"
+msgstr "%s 子行程"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "%s 副行程出現代表嚴重錯誤的訊號 %d"
+msgstr "%s 子行程取得嚴重錯誤訊號 %d"
+
+#: src/cldr-plurals.c:61
+#, c-format
+msgid "Could not parse file %s as XML"
+msgstr ""
+
+#: src/cldr-plurals.c:69
+#, c-format
+msgid "The root element must be <%s>"
+msgstr "根元素必須為 <%s>"
+
+#: src/cldr-plurals.c:82
+#, c-format
+msgid "The element <%s> does not contain a <%s> element"
+msgstr "元素 <%s> 未包含 <%s> 元素"
+
+#: src/cldr-plurals.c:104 src/cldr-plurals.c:144
+#, c-format
+msgid "The element <%s> does not have attribute <%s>"
+msgstr "元素 <%s> 未包含 <%s> 屬性"
+
+#: src/cldr-plurals.c:188 src/hostname.c:208 src/msgattrib.c:417
+#: src/msgcat.c:362 src/msgcmp.c:208 src/msgcomm.c:354 src/msgconv.c:303
+#: src/msgen.c:300 src/msgexec.c:258 src/msgfilter.c:409 src/msgfmt.c:902
+#: src/msggrep.c:512 src/msginit.c:362 src/msgmerge.c:536 src/msgunfmt.c:423
+#: src/msguniq.c:322 src/recode-sr-latin.c:142 src/urlget.c:171
+#: src/xgettext.c:1019
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "執行「%s --help」取得更多資訊。\n"
+
+#: src/cldr-plurals.c:192
+#, c-format
+msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
+msgstr "用法：%s [選項…] [語言規則]…\n"
+
+#: src/cldr-plurals.c:197
+#, c-format, no-wrap
+msgid ""
+"Extract or convert Unicode CLDR plural rules.\n"
+"\n"
+"If both LOCALE and RULES are specified, it reads CLDR plural rules for\n"
+"LOCALE from RULES and print them in a form suitable for gettext use.\n"
+"If no argument is given, it reads CLDR plural rules from the standard input.\n"
+msgstr ""
+"擷取或轉換 Unicode CLDR 複數規則。\n"
+"\n"
+"如果同時指定了 <語系> 和 <規則>，程式將從給定 <規則> 中讀取指定 <語系> 的\n"
+"CLDR 複數規則，並將其輸出為適合 gettext 使用的表格。\n"
+"如果沒有給定參數，程式將從標準輸入讀取 CLDR 複數規則。\n"
+
+#: src/cldr-plurals.c:206 src/msgfmt.c:915 src/xgettext.c:1032
+#, 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/cldr-plurals.c:211
+#, c-format
+msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
+msgstr "  -c, --cldr                  使用 CLDR 格式顯示出複數規則\n"
+
+#: src/cldr-plurals.c:213 src/hostname.c:231 src/msgattrib.c:536
+#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387
+#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068
+#: src/msggrep.c:630 src/msginit.c:426 src/msgmerge.c:666 src/msgunfmt.c:529
+#: src/msguniq.c:419 src/recode-sr-latin.c:163 src/urlget.c:187
+#: src/xgettext.c:1207
+#, c-format, no-wrap
+msgid "  -h, --help                  display this help and exit\n"
+msgstr "  -h, --help                  顯示本訊息，然後結束\n"
+
+#: src/cldr-plurals.c:215 src/hostname.c:233 src/msgattrib.c:538
+#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:389
+#: src/msgen.c:385 src/msgexec.c:309 src/msgfilter.c:511 src/msgfmt.c:1070
+#: src/msggrep.c:632 src/msginit.c:428 src/msgmerge.c:668 src/msgunfmt.c:531
+#: src/msguniq.c:421 src/recode-sr-latin.c:166 src/urlget.c:189
+#: src/xgettext.c:1209
+#, c-format, no-wrap
+msgid "  -V, --version               output version information and exit\n"
+msgstr "  -V, --version               顯示版本資訊，然後結束\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. 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/cldr-plurals.c:222 src/hostname.c:240 src/msgattrib.c:545
+#: src/msgcat.c:479 src/msgcmp.c:268 src/msgcomm.c:465 src/msgconv.c:396
+#: src/msgen.c:392 src/msgexec.c:316 src/msgfilter.c:518 src/msgfmt.c:1081
+#: src/msggrep.c:639 src/msginit.c:435 src/msgmerge.c:679 src/msgunfmt.c:540
+#: src/msguniq.c:428 src/recode-sr-latin.c:173 src/urlget.c:198
+#: src/xgettext.c:1216
+msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
+
+#: src/cldr-plurals.c:287 src/hostname.c:179 src/msgattrib.c:355
+#: src/msgcat.c:293 src/msgcmp.c:171 src/msgcomm.c:284 src/msgconv.c:244
+#: src/msgen.c:241 src/msgexec.c:185 src/msgfilter.c:288 src/msgfmt.c:444
+#: src/msggrep.c:419 src/msginit.c:268 src/msgmerge.c:372 src/msgunfmt.c:262
+#: src/msguniq.c:264 src/recode-sr-latin.c:109 src/urlget.c:142
+#: src/xgettext.c:667
+#, 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"
+#| "This is free software: you are free to change and redistribute it.\n"
+#| "There is NO WARRANTY, to the extent permitted by law.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"版權所有 (C) %s 自由軟體基金會\n"
+"GPLv3+ 授權：GNU GPL 第三版或更新版本 <https://gnu.org/licenses/gpl.html>。\n"
+"此為自由軟體：您能修改與重散布它。\n"
+"在法律允許的範圍內沒有任何擔保。\n"
+"\n"
+
+#: src/cldr-plurals.c:293 src/hostname.c:185 src/msgattrib.c:361
+#: src/msgcat.c:299 src/msgcmp.c:177 src/msgcomm.c:290 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msgfmt.c:450
+#: src/msggrep.c:425 src/msginit.c:274 src/msgmerge.c:378 src/msgunfmt.c:268
+#: src/msguniq.c:270 src/urlget.c:148 src/xgettext.c:673
+#, c-format
+msgid "Written by %s.\n"
+msgstr "由 %s 編寫。\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/cldr-plurals.c:293
+msgid "Daiki Ueno"
+msgstr "Daiki Ueno"
+
+#: src/cldr-plurals.c:313
+#, c-format
+msgid "%s cannot be read"
+msgstr "無法讀取 %s"
+
+#: src/cldr-plurals.c:319
+#, c-format
+msgid "cannot extract rules for %s"
+msgstr "無法擷取 %s 的規則"
+
+#: src/cldr-plurals.c:329
+#, c-format
+msgid "cannot parse CLDR rule"
+msgstr "無法解析 CLDR 規則"
+
+#: src/cldr-plurals.c:364
+#, c-format
+msgid "extra operand %s"
+msgstr "額外的運算元 %s"
 
 # 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/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:1925
-#: src/xgettext.c:1938 src/xgettext.c:1948
+#: src/file-list.c:53 src/msggrep.c:248 src/open-catalog.c:122
+#: src/read-mo.c:269 src/read-tcl.c:126 src/urlget.c:215
+#: src/write-desktop.c:173 src/xgettext.c:1705 src/xgettext.c:1718
+#: src/xgettext.c:1728
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
 
-#: src/format.c:151
-#, 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:627 src/format-librep.c:312 src/format-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-gcc-internal.c:627 src/format-javascript.c:355
+#: src/format-kde.c:223 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-pascal.c:398 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 '%s'"
-msgstr "‘%2$s’ 中第 %1$u 個引數的規格在 ‘msgid’ 中並不存在"
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr "第 %u 個參數的格式規範，如同「%s」，未在「%s」出現"
 
 #: 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-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-gcc-internal.c:638 src/format-javascript.c:366
+#: src/format-kde.c:234 src/format-librep.c:323 src/format-lua.c:235
+#: src/format-pascal.c:409 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’中並不存在"
+msgstr "第 %u 個參數的規格在「%s」中並不存在"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:227
-#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
+#: src/format-gfc-internal.c:372 src/format-javascript.c:389
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:429
 #: src/format-perl.c:615 src/format-php.c:381 src/format-python.c:527
 #: src/format-tcl.c:421
-#, fuzzy, c-format
+#, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "‘msgid’和‘%s’的第 %u 個引數的規格並不相同"
+msgstr "「%1$s」中的格式規範和傳給第 %3$u 個參數的「%2$s」不同"
 
 #: src/format-boost.c:449
-#, fuzzy, c-format
+#, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "第 %u 個指令結束的不是 ‘}’，而是不合法的字元。"
+msgstr "指令編碼 %u 以 | 開頭卻不以 | 結尾。"
+
+#: src/format.c:152
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgstr "「%s」不是個有效的 %s 格式字串，因為不像「%s」。原因：%s"
 
 #: src/format-c.c:36
 #, c-format
-msgid "In the directive number %u, the token after '<' is not the name of a format specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-msgstr "在第 %u 個指令，‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格名稱，請參考 ISO C 99 規格第 7.8.1 節。"
+msgid ""
+"In the directive number %u, the token after '<' is not the name of a format "
+"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
+msgstr ""
+"在第 %u 條指令，'<' 之後的關鍵字不是正確的變數規格。如果想得知正確的變數規格"
+"名稱，請參考 ISO C 99 規格第 7.8.1 節。"
 
 #: src/format-c.c:39
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "在第 %u 個指令，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
+msgstr "在第 %u 條指令中，「<」之後的關鍵字後面缺少了「>」。"
 
 #: src/format-c.c:42 src/format-gfc-internal.c:289
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "字串中有提及第 %u 個引數，但忽略了第 %u 個。"
+msgstr "字串中有提及第 %u 個參數，但忽略了第 %u 個。"
 
-#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-javascript.c:215 src/format-python.c:515
-#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363
+#: src/format-python.c:515 src/format-qt-plural.c:110
+#, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "‘msgid’ 和 ‘%s’ 的格式規格數目不符"
+msgstr "「%s」中的格式規範數與「%s」不符"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:85 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
+msgstr "第 %u 條指令中，「{」後沒有參數編號。"
 
-#: src/format-csharp.c:109
+#: src/format-csharp.c:106
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
+msgstr "在第 %u 條指令，「,」後面接的不是數字。"
 
-#: src/format-csharp.c:130 src/format-java.c:191
-msgid "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr ""
+#: src/format-csharp.c:127 src/format-java.c:191
+msgid ""
+"The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr "字串在指令中間結束：發現了「{」但沒有對稱的「}」。"
 
-#: src/format-csharp.c:139
+#: src/format-csharp.c:136
 #, c-format
-msgid "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "第 %u 個指令結束的字元是 ‘%c’ 而不是 ‘}’。"
+msgid ""
+"The directive number %u ends with an invalid character '%c' instead of '}'."
+msgstr "第 %u 條指令結束的字元是「%c」而不是「}」。"
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:137
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "第 %u 個指令結束的不是 ‘}’，而是不合法的字元。"
+msgstr "第 %u 條指令結束的不是「}」，而是不合法的字元。"
 
-#: src/format-csharp.c:161 src/format-java.c:346
-msgid "The string starts in the middle of a directive: found '}' without matching '{'."
-msgstr ""
+#: src/format-csharp.c:158 src/format-java.c:346
+msgid ""
+"The string starts in the middle of a directive: found '}' without matching "
+"'{'."
+msgstr "字串在指令中間開始：發現了「}」但沒有對稱的「{」。"
 
-#: src/format-csharp.c:162
+#: src/format-csharp.c:159
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "第 %u 個指令後出現單獨的 ‘}’。"
+msgstr "第 %u 條指令後出現單獨的「}」。"
 
 #: src/format-gcc-internal.c:255
-#, fuzzy, c-format
+#, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgstr "指令編碼 %u 中的旗標組合無效。"
 
 #: src/format-gcc-internal.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
+msgstr "指令編碼 %u 中的精度不允許在「%c」之前出現。"
 
 #: 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 不是正整數。"
+#, c-format
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr "第 %u 條指令中，精度的參數個數必須是 %u 個。"
 
 #: 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-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "第 %u 條指令中，「%c」前不允許指定精度。"
 
 #: src/format-gcc-internal.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgstr "第 %u 條指令中，精度指定無效。"
 
 #: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr ""
+msgstr "第 %u 條指令中，「%c」前不允許帶有旗標。"
 
 #: src/format-gcc-internal.c:677
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "‘msgid’ 使用了 %%m 但 ‘%s’ 沒有。"
+msgstr "「%s」使用了 %%m，但「%s」沒有使用"
 
 #: src/format-gcc-internal.c:680
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
+msgstr "「%s」未使用 %%m，但「%s」卻使用了 %%m"
 
 #: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "‘msgid’ 使用了 %%m 但 ‘%s’ 沒有。"
+msgstr "「%s」要用 %%C，但「%s」沒有"
 
 #: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
+msgstr "「%s」沒有使用 %%C，但「%s」要用 %%C"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "在指令中間，字串突然結束"
+msgstr "在指令中間，字串突然結束。"
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的引數"
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的參數。"
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "第 %u 個指令中的數字 0 不是正整數。"
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
+msgstr "第 %u 條指令中的數字 0 不是正整數。"
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
-msgstr ""
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
+msgstr "第 %u 條指令中，寬度的第 0 個參數不是正整數。"
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
-msgstr ""
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
+msgstr "第 %u 條指令中，精度的第 0 個參數不是正整數。"
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
-msgstr "第 %u 個指令的 ‘%c’ 字元屬於無效的列印格式。"
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
+msgstr "第 %u 條指令的「%c」字元屬於無效的轉換格式。"
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
-msgstr "用來結束第 %u 個指令的字元屬於無效的列印格式。"
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
+msgstr "用來結束第 %u 條指令的字元屬於無效的轉換格式。"
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "字串採用了不相容的方法來表示第 %u 個引數。"
+msgstr "字串採用了不相容的方法來表示第 %u 個參數。"
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "第 %u 個指令的子字串 %s 是無效的日期/時間格式。"
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr "第 %u 條指令的子字串「%s」的日期/時間格式無效。"
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
+msgstr "第 %u 條指令的 %s 後面缺少逗號。"
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
+msgstr "第 %u 條指令的子字串 %s 是無效的數字格式。"
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+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」"
+"字串。"
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr ""
+msgstr "第 %u 條指令中，選擇不包含數字。"
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr ""
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr "第 %u 條指令中，選擇包含的數字後面沒有「<」、「#」或「%s」。"
 
 #: src/format-java.c:745
-#, fuzzy, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中的引數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
+#, c-format
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr "參數 {%u}（如同「%s」）的格式規範在「%s」中不存在"
 
 #: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "引數 {%u} 的規格在 ‘%s’ 中並不存在"
+msgstr "參數 {%u} 的規格在「%s」中並不存在"
 
 #: src/format-java.c:776
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "‘msgid’ 和 ‘%s’ 的引數 {%u} 規格並不相同"
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr "參數 {%3$u} 在「%1$s」和「%2$s」中的格式規範不相同"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-kde.c:158
 #, c-format
-msgid "In the directive number %u, parameter %u is of type '%s' but a parameter of type '%s' is expected."
-msgstr ""
+msgid ""
+"The string refers to argument number %u but ignores the arguments %u and %u."
+msgstr "字串引用了第 %u 個參數但是卻忽略了第 %u 個和第 %u 個參數。"
+
+#: src/format-kde.c:242
+#, c-format
+msgid ""
+"a format specification for arguments %u and %u doesn't exist in '%s', only "
+"one argument may be ignored"
+msgstr "參數 %u 和 %u 的格式定義在「%s」中不存在，僅可忽略一個參數"
+
+#: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
+#: src/format-kde-kuit.c:274
+#, c-format
+msgid "error while parsing: %s"
+msgstr "處理該項目時發生錯誤: %s"
+
+#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
+#: src/format-scheme.c:2377
+#, c-format
+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」。"
 
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2375 src/format-scheme.c:2400
 #, c-format
-msgid "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."
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"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."
+msgstr[0] "第 %u 條指令中，給出的參數太多；最多只需要 %u 個參數。"
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2499 src/format-scheme.c:2501
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr ""
+msgstr "第 %u 條指令中，「%c」後面未接數字。"
 
-#: src/format-lisp.c:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2739 src/format-scheme.c:2756
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
+msgstr "第 %u 條指令中，參數 %d 為負數。"
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2808
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr ""
+msgstr "字串在 ~/…/ 指令中間中斷。"
 
-#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
-#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
-#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
+#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228
+#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842
+#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "找到 ‘~%c’ 但沒有 ‘~%c’ 配合。"
+msgstr "找到「~%c」但沒有對應的「~%c」。"
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2866 src/format-scheme.c:2862
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr ""
+msgstr "第 %u 條指令中，同時給出了 @ 和 : 修飾詞。"
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2979 src/format-scheme.c:2975
 #, c-format
-msgid "In the directive number %u, '~:[' is not followed by two clauses, separated by '~;'."
-msgstr ""
+msgid ""
+"In the directive number %u, '~:[' is not followed by two clauses, separated "
+"by '~;'."
+msgstr "第 %u 條指令中，「~:[」後面沒有兩個用「~;」分隔的子句。"
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3329 src/format-scheme.c:3265
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
+msgstr "第 %u 條指令中，「~;」的位置無效。"
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3435 src/format-scheme.c:3357
 msgid "The string refers to some argument in incompatible ways."
-msgstr ""
+msgstr "字串引用某些參數的方式不相容。"
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#: src/format-lisp.c:3477 src/format-scheme.c:3399
+#, c-format
 msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "‘msgid’ 和 ‘%s’ 的格式規格並非同等"
+msgstr "「%s」和「%s」中的格式規範不同"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#: src/format-lisp.c:3493 src/format-scheme.c:3415
+#, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "‘%s’ 的格式規格並非 ‘msgid’ 的格式規格的一部份"
+msgstr "「%s」中的格式規範不是「%s」格式規範的子集"
+
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 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-perl.c:433
 #, c-format
-msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
-msgstr ""
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr "第 %u 條指令中，大小指定符與轉換指定符「%c」不相容。"
 
-#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
-#: src/format-sh.c:308
+#: src/format-python-brace.c:138
 #, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "格式 ‘%s’ 的規格在 ‘%s’ 中並不存在"
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "第 %u 條指令中，「%c」不可以欄位名稱 (field name) 開始。"
+
+#: src/format-python-brace.c:157
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "第 %u 條指令中，「%c」不可以 getattr 參數開始。"
+
+#: src/format-python-brace.c:171
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "第 %u 條指令中，「%c」不可以 getitem 參數開始。"
+
+#: src/format-python-brace.c:193
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "第 %u 條指令中，格式定義中不允許過多巢狀。"
+
+#: src/format-python-brace.c:278
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "第 %u 條指令中，格式指令中無終止字元。"
 
 #: src/format-python.c:115
-msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
-msgstr ""
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr "字串同時使用兩種方式引用了參數：透過參數名稱和未命名參數指定符號。"
 
 #: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr ""
+msgstr "字串對名為「%s」的參數引用方式不相容。"
 
 #: src/format-python.c:430
-#, fuzzy, c-format
-msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "‘msgid’ 裡的規格對應的是雜湊表 (mapping)，而 ‘%s’ 的卻是固定有序列 (tuple)"
+#, c-format
+msgid ""
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr "「%s」中的格式規範需要映射，而「%s」中的格式規範需要元組"
 
 #: src/format-python.c:437
-#, fuzzy, c-format
-msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "‘msgid’ 裡的規格對應的是固定有序列 (tuple)，而 ‘%s’ 的卻是雜湊表 (mapping)"
+#, c-format
+msgid ""
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr "「%s」中的格式規範需要元組，而「%s」中的格式規範需要映射"
 
 #: 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 '%s'"
-msgstr "‘%2$s’ 中的引數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
+#, c-format
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr "參數「%s」（如同「%s」）的格式規範在「%s」中不存在"
 
 #: src/format-python.c:494
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "‘msgid’和‘%s’的引數‘%s’的格式並不相同"
-
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
-msgid "In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "在第 %u 個指令，‘,’ 後面的不是數字。"
-
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "第 %u 個指令中的數字 0 不是正整數。"
+#, c-format
+msgid ""
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr "「%s」和「%s」中對參數「%s」的格式規範不同"
 
 #: src/format-qt.c:152
 #, c-format
-msgid "'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or a double-digit argument number"
+msgid ""
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
+"'%s' 僅僅是個格式字串，但「%s」不是：其包含一個「L」旗標或是一個兩位數的參數"
+"號碼"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "字串中的 shell 變數名稱含有不屬於 ASCII 的字元。"
 
 #: src/format-sh.c:81
-msgid "The string refers to a shell variable with complex shell brace syntax. This syntax is unsupported here due to security reasons."
-msgstr "字串中的 shell 變數名稱含有較複雜的括號格式，因安全理由，這種格式不會支援。"
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"字串中的 shell 變數名稱含有較複雜的括號格式，因安全考量，這種格式不會支援。"
 
 #: src/format-sh.c:83
-msgid "The string refers to a shell variable whose value may be different inside shell functions."
-msgstr ""
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr "字串引用的 shell 變數值可能在 shell 函數中有所不同。"
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
@@ -697,451 +926,485 @@ msgstr "字串中的 shell 變數沒有名稱。"
 
 #: src/format-ycp.c:90
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a digit between 1 and 9."
-msgstr "第 %u 個指令的字元‘%c’不是 1 至 9 之間的整數。"
+msgid ""
+"In the directive number %u, the character '%c' is not a digit between 1 and "
+"9."
+msgstr "第 %u 條指令的字元「%c」不是 1 至 9 之間的整數。"
 
 #: src/format-ycp.c:91
 #, c-format
-msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
-msgstr "第 %u 個指令最後一個字元不是 1 至 9 之間的整數。"
-
-#: src/hostname.c:178 src/msgattrib.c:344 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:599
-#, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#: src/hostname.c:184 src/msgattrib.c:350 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:605
-#, c-format
-msgid "Written by %s.\n"
-msgstr "由 %s 編寫。\n"
+"The character that terminates the directive number %u is not a digit between "
+"1 and 9."
+msgstr "第 %u 條指令最後一個字元不是 1 至 9 之間的整數。"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:350 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
+#: src/hostname.c:185 src/msgattrib.c:361 src/msgcat.c:299 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:191 src/msgfilter.c:294 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:120
+#: src/urlget.c:148
 msgid "Bruno Haible"
-msgstr ""
+msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:195 src/msginit.c:284 src/recode-sr-latin.c:129
 #, c-format
 msgid "too many arguments"
-msgstr "引數過多"
+msgstr "參數過多"
 
-#: src/hostname.c:207 src/msgattrib.c:410 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:650 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:828
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "請執行 ‘%s --help’ 顯示額外資訊。\n"
-
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:366 src/recode-sr-latin.c:147
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [選項]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "列印主機的名稱。\n"
+msgstr "顯示主機的主機名稱 (hostname)。\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "輸出格式：\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short                 短的主機名稱\n"
+msgstr "  -s, --short                 短主機名稱\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:223
 #, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified domain\n"
+"  -f, --fqdn, --long          long host name, includes fully qualified "
+"domain\n"
 "                                name, and aliases\n"
-msgstr "  -f, --fqdn, --long          長的主機名稱，包括正式的網域名稱(FQDN)及別名\n"
+msgstr ""
+"  -f, --fqdn, --long          長的主機名稱，包括正式的網域名稱 (FQDN) 及別"
+"名\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: src/hostname.c:228 src/msgattrib.c:525 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:775 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:1000
+#: src/hostname.c:229 src/msgattrib.c:534 src/msgcat.c:468 src/msgcmp.c:257
+#: src/msgcomm.c:454 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:305
+#: src/msgfilter.c:507 src/msgfmt.c:1066 src/msggrep.c:628 src/msginit.c:424
+#: src/msgmerge.c:664 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:160 src/urlget.c:185 src/xgettext.c:1205
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "顯示資訊：\n"
+msgstr "資訊輸出：\n"
 
-#: src/hostname.c:230 src/msgattrib.c:527 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:777 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:1002
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  顯示本訊息，然後結束\n"
+#: src/hostname.c:256 src/hostname.c:262 src/hostname.c:269
+#, c-format
+msgid "could not get host name"
+msgstr "無法取得主機名稱"
 
-#: src/hostname.c:232 src/msgattrib.c:529 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:779 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:1004
-#, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               顯示版本資訊，然後結束\n"
+#: src/its.c:319
+#, c-format
+msgid "selector is not specified"
+msgstr "未指定選擇器"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. 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:536 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:790 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:1011
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
+#: src/its.c:326 src/its.c:1635
+#, c-format
+msgid "cannot create XPath context"
+msgstr "無法建立 XPath 上下文"
 
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/its.c:344
 #, c-format
-msgid "could not get host name"
-msgstr "無法取得主機名稱"
+msgid "cannot evaluate XPath expression: %s"
+msgstr "無法計算 XPath 表達式：%s"
+
+#: src/its.c:695
+#, c-format
+msgid "\"%s\" node does not contain \"%s\""
+msgstr "「%s」節點未包含「%s」"
+
+#: src/its.c:1086
+#, c-format
+msgid "invalid attribute value \"%s\" for \"%s\""
+msgstr "無效的屬性值「%s」（用於「%s」）"
+
+#: src/its.c:1418
+#, c-format
+msgid "the root element is not \"rules\" under namespace %s"
+msgstr "根元素不是 %s 命名空間下的「規則」（「rules」）"
+
+#: src/its.c:1461 src/its.c:1487 src/its.c:1882 src/its.c:2003
+#: src/locating-rule.c:170
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "無法讀取 %s：%s"
+
+#: src/its.c:1658
+#, c-format
+msgid "cannot evaluate XPath location path: %s"
+msgstr "無法計算 XPath 地址路徑：%s"
+
+#: src/locating-rule.c:236
+#, c-format
+msgid "\"%s\" node does not have \"%s\""
+msgstr "「%s」節點未包含「%s」"
 
-#: src/msgattrib.c:365 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#: src/locating-rule.c:307
+#, c-format
+msgid "cannot read XML file %s"
+msgstr "無法讀取 XML 檔案 %s"
+
+#: src/locating-rule.c:319
+#, c-format
+msgid "the root element is not \"locatingRules\""
+msgstr "根元素不是「locatingRules」"
+
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:153 src/msgfilter.c:196
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
 #, c-format
 msgid "at most one input file allowed"
 msgstr "最多只接受一個輸入檔"
 
-#: src/msgattrib.c:371 src/msgattrib.c:375 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:615 src/xgettext.c:619 src/xgettext.c:626 src/xgettext.c:629
-#: src/xgettext.c:632
+#: src/msgattrib.c:382 src/msgcat.c:315 src/msgcomm.c:300 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:309 src/msgfmt.c:503 src/msgfmt.c:511
+#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:446 src/msgmerge.c:403
+#: src/msgmerge.c:408 src/msgmerge.c:413 src/msgmerge.c:418 src/msgmerge.c:439
+#: src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:683 src/xgettext.c:690
+#: src/xgettext.c:693 src/xgettext.c:696 src/xgettext.c:720
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s 和 %s 兩者是互不相容的"
+msgstr "%s 和 %s 兩者互不相容"
 
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [選項] [輸入檔]\n"
 
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
 #, 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:423 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
+#: src/msgattrib.c:430 src/msgcat.c:383 src/msgcmp.c:226 src/msgcomm.c:374
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:286 src/msgfilter.c:421
+#: src/msggrep.c:526 src/msginit.c:376 src/msgmerge.c:557 src/msgunfmt.c:435
+#: src/msguniq.c:342
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "長選項必須用的引數在使用短選項時也是必須的。\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr "長選項必須用的參數也必須在短選項使用。\n"
 
-#: src/msgattrib.c:426 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:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c:386 src/msgcmp.c:229 src/msgcomm.c:377
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:289 src/msgfilter.c:424
+#: src/msgfmt.c:920 src/msggrep.c:529 src/msginit.c:379 src/msgmerge.c:560
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:1037
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
+msgstr "  輸入檔                       用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c:430 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:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c:392 src/msgcmp.c:235 src/msgcomm.c:383
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:293 src/msgfilter.c:428
+#: src/msgfmt.c:924 src/msggrep.c:533 src/msgmerge.c:566 src/msguniq.c:349
+#: src/xgettext.c:1043
 #, c-format
-msgid "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定<目錄>\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定 <目錄>\n"
 
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:295 src/msgfilter.c:430
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
+msgstr "如果沒有指定輸入檔或輸入檔是「-」，則由標準輸入讀取內容。\n"
 
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msggrep.c:538
+#: src/msginit.c:387 src/msgmerge.c:578 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:1048
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔位置：\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:435 src/msgfmt.c:950 src/msgfmt.c:999
+#: src/msgfmt.c:1018 src/msggrep.c:540 src/msgmerge.c:580 src/msgunfmt.c:491
+#: src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定<檔案>\n"
+msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定 <檔案>\n"
 
-#: src/msgattrib.c:439 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
+#: src/msgattrib.c:446 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:437 src/msggrep.c:542 src/msgmerge.c:582
+#: src/msgunfmt.c:493 src/msguniq.c:358
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示結果。\n"
+msgstr "如果沒有指定 <輸出檔> 或 <輸出檔> 是「-」，則會在標準輸出顯示結果。\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:362
 #, c-format
 msgid "Message selection:\n"
-msgstr "篩選訊息：\n"
+msgstr "訊息選擇方式：\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
 #, c-format
-msgid "      --translated            keep translated, remove untranslated messages\n"
+msgid ""
+"      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"  -u, --unique                等於 --less-than=2，表示只顯示\n"
-"                              只有一種翻譯的字句\n"
+"      --previous              設定「fuzzy」標記時，\n"
+"                              保留原翻譯訊息前的 msgid。\n"
 
-#: src/msgattrib.c:471
-#, fuzzy, c-format
-msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
-msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
+#: src/msgattrib.c:478
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr "      --clear-previous        從所有條目中刪除「先前的 msgid」\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
 #, c-format
-msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
+msgid ""
+"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --empty                 刪除「fuzzy」標記時，也一併清空 msgstr\n"
+
+#: src/msgattrib.c:482
+#, 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:475
+#: src/msgattrib.c:484
 #, c-format
-msgid "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
+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:477
+#: src/msgattrib.c:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等於 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
 #, c-format
-msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgid ""
+"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:482 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:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 src/msgfilter.c:462
+#: src/msgfmt.c:1028 src/msggrep.c:585 src/msginit.c:395 src/msgmerge.c:618
+#: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "輸入檔格式：\n"
+msgstr "輸入檔語法：\n"
 
-#: src/msgattrib.c:484 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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300
+#: src/msgfilter.c:464 src/msggrep.c:587 src/msginit.c:397 src/msguniq.c:371
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      以 Java .properties 格式處理輸入檔\n"
 
-#: src/msgattrib.c:486 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
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:302
+#: src/msgfilter.c:466 src/msggrep.c:589 src/msginit.c:399 src/msguniq.c:373
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:469 src/msgfmt.c:1056 src/msggrep.c:592
+#: src/msginit.c:402 src/msgmerge.c:626 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:1149
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:491 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:948
+#: src/msgattrib.c:500 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:471 src/msggrep.c:594 src/msginit.c:408
+#: src/msgmerge.c:630 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:1151
 #, 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"
+"                              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:495 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:952
+#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:475 src/msggrep.c:598 src/msginit.c:412
+#: src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:1155
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
+msgstr "      --style=樣式檔           為 --color 參數指定 CSS 樣式檔案\n"
 
-#: src/msgattrib.c:497 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:954
+#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:636 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:1157
 #, c-format
-msgid "  -e, --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgattrib.c:499 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:956
+#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:479 src/msgmerge.c:638 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:1159
 #, c-format
-msgid "  -E, --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                在輸出結果中使用 C 轉義控制序列 (escape sequence)\n"
+"  -E, --escape                在輸出結果中使用 C 轉義控制序列 (escape "
+"sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msgattrib.c:501 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:958
+#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:481 src/msggrep.c:604 src/msgmerge.c:640
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:1161
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算沒有內容仍產生 PO 檔\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395
+#: src/xgettext.c:1163
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                寫入的 .po 檔內容會進行縮排\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397
+#: src/xgettext.c:1165
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           不加入類似 '#: 檔案:行號' 的源代碼位置\n"
+msgstr "      --no-location           不加入類似 '#: 檔案:行號' 的原始碼位置\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399
+#: src/xgettext.c:1167
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          會加入 '#: 檔案:行號' 格式的源代碼位置 (預設)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          會加入 '#: 檔案:行號' 格式的原始碼位置 (預設)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:401
+#: src/xgettext.c:1169
 #, c-format
-msgid "      --strict                write out strict Uniforum conforming .po file\n"
-msgstr "      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
 
-#: src/msgattrib.c:511 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
+#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:614 src/msginit.c:414
+#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output    產生 Java .properties 檔案\n"
+msgstr "  -p, --properties-output     產生 Java .properties 檔案\n"
 
-#: src/msgattrib.c:513 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:970
+#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:616 src/msginit.c:416
+#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1173
 #, c-format
-msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:515 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:972
+#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:618 src/msginit.c:418
+#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1177
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔每行寬度\n"
 
-#: src/msgattrib.c:517 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:974
+#: src/msgattrib.c:526 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:499 src/msggrep.c:620 src/msginit.c:420
+#: src/msgmerge.c:656 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:1179
 #, 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"
+msgstr ""
+"      --no-wrap               即使輸出的訊息超出頁寬，也不將輸出的訊息斷行\n"
 
-#: src/msgattrib.c:520 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:977
+#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1182
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           將輸出結果排序\n"
+msgstr "  -s, --sort-output           排序輸出結果\n"
 
-#: src/msgattrib.c:522 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:979
+#: src/msgattrib.c:531 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:504 src/msgmerge.c:661 src/msguniq.c:414
+#: src/xgettext.c:1184
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
@@ -1151,13 +1414,13 @@ msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出現的選擇條件 (%d < n <%d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:1023
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "用法：%s [選項] [輸入檔]...\n"
+msgstr "用法：%s [選項] [輸入檔]…\n"
 
 #: src/msgcat.c:371
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1169,26 +1432,28 @@ msgid ""
 "that if --use-first is specified, they will be taken from the first PO file\n"
 "to define them.\n"
 msgstr ""
-"合併指定的 PO 檔。\n"
-"在兩個或多個指定的 PO 檔中找出共同的翻譯訊息。利用 --more-than 選項，可以\n"
-"令訊息在不同檔案出現的次數較多才會列印。相反地，--less-than 選項則會令訊息\n"
-"在不同檔案出現的次數較少才列印（例如 --less-than=2 表示列印只出現一次的訊\n"
-"息）。翻譯內容、自行加上的註解和原程式碼的註解都會累積，除非使用了\n"
-"--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
-"所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
+"連接並合併指定的 PO 檔案。\n"
+"在兩個或多個指定的 PO 檔案中找出共同的翻譯訊息。\n"
+"利用 --more-than 選項，可以令訊息在不同檔案中\n"
+"出現的次數較多時才顯示。\n"
+"相反地，--less-than 選項則會令訊息在不同檔案中\n"
+"出現的次數較少時才顯示\n"
+"(例如 --less-than=2 表示顯示只出現一次的訊息)。\n"
+"翻譯內容、自行加上的註解和原始碼註解，以及檔案中的位置等都會累積，\n"
+"除非使用了 --use-first 選項，那樣則會由第一個包含該翻譯條目的檔案取得資料。\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1039
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  INPUTFILE ...               輸入檔\n"
+msgstr "  輸入檔 ..   .                輸入檔\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1041
 #, 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:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:325 src/msgfmt.c:926
+#: src/xgettext.c:1045
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀取資料。\n"
@@ -1220,60 +1485,63 @@ msgstr ""
 "  -u, --unique                等於 --less-than=2，表示只顯示\n"
 "                              只有一種翻譯的字句\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030
+#: src/msgmerge.c:620
 #, c-format
-msgid "  -P, --properties-input      input files are in Java .properties syntax\n"
+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:412 src/msgfmt.c:741
-#: src/msgmerge.c:559
+#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1032
+#: src/msgmerge.c:622
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
+msgstr ""
+"      --stringtable-input     輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
 
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:427 src/msgconv.c:337 src/msguniq.c:378
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=名稱          輸出的編碼\n"
+msgstr "  -t, --to-code=名稱          輸出的編碼方式\n"
 
-#: src/msgcat.c:429 src/msguniq.c:379
+#: src/msgcat.c:429 src/msguniq.c:380
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             每句只使用第一個出現的翻譯，而不會將所有\n"
+"      --use-first             每句只使用第一個出現的翻譯，而不會將數個\n"
 "                              翻譯合併起來\n"
 
-#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
+#: src/msgcat.c:432 src/msgen.c:345 src/msgmerge.c:628
 #, c-format
-msgid "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr ""
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr "      --lang=CATALOGNAME      在檔案頭中設定 'Language'\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:177 src/msgcomm.c:290 src/msgmerge.c:378
 msgid "Peter Miller"
-msgstr ""
+msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:188 src/msgmerge.c:389
 #, c-format
 msgid "no input files given"
 msgstr "未指定輸入檔"
 
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:193 src/msgmerge.c:394
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "需要恰好指定兩個輸入檔"
+msgstr "需要剛好指定兩個輸入檔"
 
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:212 src/msgmerge.c:540
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [選項] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:217
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1289,62 +1557,65 @@ msgstr ""
 "此程式可用來檢查程式中的所有的訊息是否都已經翻譯好了。比較時如果\n"
 "有不完全配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:231
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      翻譯檔\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:233
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     未翻譯檔案\n"
+msgstr "  ref.pot                     來源參考檔 \n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:238 src/msgmerge.c:606
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "運作模式有關選項：\n"
+msgstr "操作模式有關選項：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:548
+#: src/msgcmp.c:240 src/msgmerge.c:608
 #, 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"
+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:550
+#: src/msgcmp.c:242 src/msgmerge.c:613
 #, 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
+#: src/msgcmp.c:244
+#, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
+msgstr "      --use-fuzzy             使用標記為 fuzzy 的條目\n"
 
-#: src/msgcmp.c:247
-#, fuzzy, c-format
+#: src/msgcmp.c:246
+#, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
+msgstr "      --use-untranslated      使用未翻譯的條目\n"
 
 #: src/msgcmp.c:324
-#, fuzzy, c-format
+#, c-format
 msgid "this message is untranslated"
-msgstr "警告：沒有使用這個訊息"
+msgstr "此條目未翻譯"
 
 #: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr ""
+msgstr "此條目需要由翻譯者復審"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1576
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "這個訊息有使用過但沒有定義..."
+msgstr "這個訊息有使用過但沒有定義…"
 
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1579
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...但這個定義很相似"
+msgstr "…但這個定義很相似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1608
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "這個訊息有使用過但在 %s 中沒有定義"
@@ -1354,7 +1625,7 @@ msgstr "這個訊息有使用過但在 %s 中沒有定義"
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:775 src/msgfmt.c:1604 src/xgettext.c:992
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1366,7 +1637,7 @@ msgid "at least two files must be specified"
 msgstr "必須指定至少兩個檔案"
 
 #: src/msgcomm.c:363
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
@@ -1377,78 +1648,84 @@ msgid ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"在兩個或多個指定的 PO 檔中找出共同的翻譯訊息。利用 --more-than 選項，可以\n"
-"令訊息在不同檔案出現的次數較多才會列印。相反地，--less-than 選項則會令訊息\n"
-"在不同檔案出現的次數較少才列印（例如 --less-than=2 表示列印只出現一次的\n"
-"訊息）。翻譯內容、自行加上的註解和原程式碼的註解都會保留，但只會由第一個\n"
-"含有該翻譯條目的檔案取得。所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
+"在兩個或多個指定的 PO 檔案中找出共同的翻譯訊息。\n"
+"利用 --more-than 選項，可以令訊息在不同檔案出現的次數較多時才會列印。\n"
+"相反地，--less-than 選項則會令訊息在不同檔案出現的次數較少時才列印\n"
+"（例如 --less-than=2 表示列印只出現一次的訊息）。\n"
+"翻譯內容、自行加上的註解和原始程式註解的註解都會保留，\n"
+"但只會保留最先定義這些訊息的 PO 檔案中的內容。\n"
+"所有 PO 檔案中的翻譯條目的檔案位置都會累積下來。\n"
 
 #: 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 "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
+msgstr ""
+"  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，若未設定則預設為 1 "
+"次\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:981
-#, fuzzy, c-format
-msgid "      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr "      --omit-header           不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
+#: src/msgcomm.c:451 src/xgettext.c:1186
+#, c-format
+msgid ""
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+msgstr "      --omit-header           不寫入帶有「msgid \"\"」項目的檔案標頭\n"
 
-#: src/msgconv.c:306
+#: src/msgconv.c:311
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
 
-#: src/msgconv.c:330
+#: src/msgconv.c:335
 #, c-format
 msgid "Conversion target:\n"
 msgstr "轉換目標：\n"
 
-#: src/msgconv.c:334
+#: src/msgconv.c:339
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "預設的編碼為目前語言的編碼。\n"
 
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:642
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:487 src/msggrep.c:608
+#: src/msgmerge.c:644
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           不輸出源代碼位置\n"
+msgstr "      --no-location           不輸出原始碼位置\n"
 
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:610
+#: src/msgmerge.c:646
 #, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "      --add-location          保留源代碼位置 (預設)\n"
+msgid ""
+"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr "  -n, --add-location          保留「#: 檔名:行號」行 (預設值)\n"
 
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:612
+#: src/msgmerge.c:648
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c:463 src/xgettext.c:713
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
 
-#: src/msgen.c:253
+#: src/msgen.c:263
 #, c-format
 msgid "exactly one input file required"
-msgstr "需要恰好指定一個輸入檔"
+msgstr "需要剛好指定一個輸入檔"
 
-#: src/msgen.c:298
+#: src/msgen.c:304
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [選項] 輸入檔\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:309
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1459,22 +1736,22 @@ msgstr ""
 "產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
 "未翻譯的條目會填上和 msgid 一樣的字串。\n"
 
-#: src/msgen.c:315
+#: src/msgen.c:321
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  輸入檔                      作為輸入的 PO 或 POT 檔\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:201
 #, c-format
 msgid "missing command name"
-msgstr "缺少了指令名稱"
+msgstr "缺少指令名稱"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:262
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [選項] 指令 [指令選項]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:267
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1484,446 +1761,604 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 "以翻譯檔的所有翻譯條目內容作為某指令的輸入資料。\n"
-"<指令>可以是任何由標準輸入讀入翻譯條目的程式。\n"
+"<指令> 可以是任何由標準輸入讀入翻譯條目的程式。\n"
 "對於每個翻譯條目指令都會執行一次。它的輸出結果\n"
 "即是 msgexec 的輸出結果。msgexec 的回傳值是所有\n"
 "指令執行的回傳值的最大值。\n"
 
-#: src/msgexec.c:271
+#: src/msgexec.c:276
 #, 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 ""
-"有一個稱為 '0' 的特殊內置指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
-"“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
+"有一個稱為 '0' 的特殊內建指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
+"「msgexec 0」的輸出適用於作為「xargs -0」的輸入。\n"
+
+#: src/msgexec.c:281
+#, c-format
+msgid "Command input:\n"
+msgstr "指令輸入：\n"
+
+#: src/msgexec.c:283
+#, c-format
+msgid "  --newline                   add newline at the end of input\n"
+msgstr "  --newline                   在輸入末尾新增換行字元\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:291 src/msgfilter.c:426
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:355
 #, c-format
 msgid "write to stdout failed"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/msgfilter.c:289
+#: src/msgfilter.c:304
 #, c-format
 msgid "missing filter name"
-msgstr "未指定過濾器"
+msgstr "未指定過濾器名稱"
 
-#: src/msgfilter.c:313
+#: src/msgfilter.c:324
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "必須指定至少一個 sed script"
+msgstr "必須指定至少一個 sed 指令碼"
 
-#: src/msgfilter.c:388
+#: src/msgfilter.c:413
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [選項] 過濾器 [過濾器選項]\n"
 
-#: src/msgfilter.c:392
+#: src/msgfilter.c:417
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:441
 #, 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 ""
-"<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
+"<過濾器> 可以是任何由標準輸入讀入譯文條目\n"
 "並將修改後的翻譯寫進標準輸出的程式。\n"
 
-#: src/msgfilter.c:421
+#: src/msgfilter.c:446
 #, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項：\n"
+msgid "Filter input and output:\n"
+msgstr "過濾器輸入與輸出：\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:448
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgid ""
+"  --newline                   add a newline at the end of input and\n"
+"                                remove a newline from the end of output"
 msgstr ""
+"  --newline                   在輸入結尾新增一個換行字元\n"
+"                                並移除輸出結尾的換行字元"
+
+#: src/msgfilter.c:452
+#, c-format
+msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
+msgstr "當 <過濾器> 是「sed」時比較有用的選項：\n"
+
+#: src/msgfilter.c:454
+#, c-format
+msgid ""
+"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
+msgstr "  -e, --expression=指令       將 <指令碼> 新增到欲執行的指令中\n"
 
-#: src/msgfilter.c:425
+#: src/msgfilter.c:456
 #, c-format
 msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the commands\n"
+"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
+"commands\n"
 "                                to be executed\n"
 msgstr ""
+"  -f, --file=指令碼檔案         將 <指令碼檔案> 的內容新增到欲執行的指令中\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:459
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       不會自動顯示過濾後的結果\n"
 
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:477 src/msggrep.c:600
 #, c-format
-msgid "      --no-escape             do not use C escapes in output (default)\n"
+msgid ""
+"      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:483 src/msggrep.c:606
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                將輸出結果進行縮排\n"
 
-#: src/msgfilter.c:454
+#: src/msgfilter.c:485
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgid ""
+"      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保護標頭內容，過濾內容時不會被更改\n"
 
-#: src/msgfmt.c:304
+#: src/msgfilter.c:665
+#, c-format
+msgid "filter output is not terminated with a newline"
+msgstr "filter 輸出未以換行字元終止"
+
+#: src/msgfmt.c:372
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "%s 的引數應該是一個標點符號"
+msgstr "%s 的參數應該是一個標點符號"
 
-#: src/msgfmt.c:351
+#: src/msgfmt.c:419
 #, c-format
 msgid "invalid endianness: %s"
-msgstr ""
+msgstr "無效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:450 src/msgunfmt.c:268 src/xgettext.c:673
 msgid "Ulrich Drepper"
-msgstr ""
+msgstr "Ulrich Drepper"
+
+#: src/msgfmt.c:471
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "若指定了 %s 和% s，則不需指定輸入檔案"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s 需要指定 “-d 目錄” 選項"
+msgstr "%s 需要指定「-d 目錄」規範"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s 需要指定 “-l locale” 選項"
+msgstr "%s 需要指定「-l locale」規範"
+
+#: src/msgfmt.c:571 src/msgfmt.c:599
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s 需要指定「--template template」規範"
+
+#: src/msgfmt.c:578 src/msgfmt.c:606
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s 需要指定「-o file」規範"
+
+#: src/msgfmt.c:584 src/msgfmt.c:612
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "在 %3$s 中 %1$s 和 %2$s 互斥"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:626 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:484 src/msgfmt.c:490
+#: src/msgfmt.c:632 src/msgfmt.c:638
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
+#: src/msgfmt.c:711
+#, c-format
+msgid "cannot locate ITS rules for %s"
+msgstr "無法定位 %s 的 ITS 規則"
+
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:872
 #, c-format
 msgid "%s: "
-msgstr ""
+msgstr "%s："
 
-#: src/msgfmt.c:624
+#: src/msgfmt.c:876
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
-msgstr[0] "已翻譯 %d 個條目"
+msgstr[0] "已翻譯 %d 條訊息"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:881
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] "，有 %d 個條目標記為模糊翻譯"
+msgstr[0] "，有 %d 條訊息被標記為模糊翻譯"
 
-#: src/msgfmt.c:634
+#: src/msgfmt.c:886
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] "，還有 %d 個條目未翻譯"
+msgstr[0] "，未翻譯 %d 條訊息"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:906
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "用法：%s [選項] filename.po ...\n"
+msgstr "用法：%s [選項] filename.po …\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:910
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
-
-#: src/msgfmt.c:663 src/xgettext.c:841
-#, c-format, no-wrap
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr "長選項必要的引數在使用短選項時也是必要的。對於選擇性的引數也一樣。\n"
+msgstr "從文字翻譯描述產生二進位訊息目錄。\n"
 
-#: src/msgfmt.c:670
+#: src/msgfmt.c:922
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  filename.po ...             輸入檔\n"
+msgstr "  filename.po …               輸入檔\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
+#: src/msgfmt.c:929 src/msgmerge.c:572 src/msgunfmt.c:438 src/xgettext.c:1081
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:679
+#: src/msgfmt.c:931
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java 模式：產生 Java ResourceBundle 類別\n"
 
-#: src/msgfmt.c:681
+#: src/msgfmt.c:933
 #, c-format
-msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-msgstr "      --java2                 類似 --java，假設格式為 Java2 (JDK 1.2 或以上)\n"
+msgid ""
+"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
+"higher)\n"
+msgstr ""
+"      --java2                 類似 --java，但假設格式為 Java2 (JDK 1.2 或以"
+"上)\n"
 
-#: src/msgfmt.c:683
+#: src/msgfmt.c:935
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:685
+#: src/msgfmt.c:937
 #, c-format
-msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
-msgstr "      --csharp-resources      C# resources 模式，會產生 .NET .resources 檔案\n"
+msgid ""
+"      --csharp-resources      C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# 資源模式，會產生 .NET .resources 檔案\n"
 
-#: src/msgfmt.c:687
+#: src/msgfmt.c:939
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：產生 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:689
+#: src/msgfmt.c:941
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:696
+#: src/msgfmt.c:943
+#, c-format
+msgid ""
+"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --desktop               桌面項目模式: 產生 .desktop 檔案\n"
+
+#: src/msgfmt.c:945
+#, c-format
+msgid "      --xml                   XML mode: generate XML file\n"
+msgstr "      --xml                   XML 模式：產生 XML 檔案\n"
+
+#: src/msgfmt.c:952
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:865
+#: src/msgfmt.c:954 src/xgettext.c:1056
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
 
-#: src/msgfmt.c:701
+#: src/msgfmt.c:957
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=RESOURCE     resource 名稱\n"
+msgstr "  -r, --resource=資源          資源名稱\n"
 
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgfmt.c:987 src/msgfmt.c:997
+#: src/msgfmt.c:1014 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"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
 msgstr ""
-"  -l, --locale=LOCALE         指定語言，可以用語言名稱或者 xy_XY 格式的\n"
+"  -l, --locale=語言代碼        指定語言，可以用語言名稱或者 xy_XY 格式的\n"
 "                              語言代號\n"
 
-#: src/msgfmt.c:707
+#: src/msgfmt.c:963
 #, c-format
-msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid ""
+"      --source                produce a .java file, instead of a .class "
+"file\n"
+msgstr "      --source                產生 .java 檔案，而非 .class 檔案\n"
+
+#: src/msgfmt.c:965
+#, c-format
+msgid ""
+"  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:709
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
-"-d 選項是必須的。class 檔會存放在指定的目錄。\n"
+"類別名稱是以附加到資源名稱的語系名稱決定，而兩者之間會使用底線分隔。\n"
+"-d 選項是必須的。class 檔將會存放到指定的目錄中。\n"
 
-#: src/msgfmt.c:715
+#: src/msgfmt.c:973
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:979 src/msgunfmt.c:473
 #, c-format
-msgid "  -d DIRECTORY                base directory for locale dependent .dll files\n"
-msgstr ""
+msgid ""
+"  -d DIRECTORY                base directory for locale dependent .dll "
+"files\n"
+msgstr "  -d 目錄                      依賴語系的 .dll 檔案的的基本目錄\n"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:981
 #, 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 ""
+"必須指定 -l 和 -d 選項。.dll 檔案將會存放到指定目錄的子目錄，\n"
+"而子目錄的名稱取決於語系。\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:985
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:731 src/msgunfmt.c:483
+#: src/msgfmt.c:989 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
+msgstr "  -d 目錄                     .msg 訊息庫的基本目錄\n"
 
-#: src/msgfmt.c:733
+#: src/msgfmt.c:991
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
+msgstr "必須指定 -l 和 -d 選項。所產生的 .msg 檔案將會存放在指定的目錄。\n"
+
+#: src/msgfmt.c:995
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "桌面項目模式選項：\n"
+
+#: src/msgfmt.c:1001
+#, c-format
+msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+msgstr "  --template=模板              用作模板的 .desktop 檔案\n"
+
+#: src/msgfmt.c:1003 src/msgfmt.c:1022
+#, c-format
+msgid "  -d DIRECTORY                base directory of .po files\n"
+msgstr "  -d 目錄                      .po 檔案的基礎目錄\n"
+
+#: src/msgfmt.c:1005 src/xgettext.c:1110
+#, c-format
+msgid ""
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
+msgstr ""
+"  -kWORD, --keyword=WORD      尋找 WORD 以作為額外的關鍵字\n"
+"  -k, --keyword               不使用預設關鍵字\n"
+
+#: src/msgfmt.c:1008 src/msgfmt.c:1024
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory.  If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
 msgstr ""
+"必須指定 -l，-o 及 --template 選項。若指定了 -D 選項，\n"
+"則輸入檔案將從目錄讀取，而非指令列參數。\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:1012
+#, c-format
+msgid "XML mode options:\n"
+msgstr "XML 模式選項：\n"
+
+#: src/msgfmt.c:1016
+#, c-format
+msgid "  -L, --language=NAME         recognise the specified XML language\n"
+msgstr "  -L, --language=NAME         識別指定的 XML 語言\n"
+
+#: src/msgfmt.c:1020
+#, c-format
+msgid "  --template=TEMPLATE         an XML file used as a template\n"
+msgstr "  --template=TEMPLATE         將指定的 XML 檔案用作模板\n"
+
+#: src/msgfmt.c:1036 src/xgettext.c:1073
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
 
-#: src/msgfmt.c:747
+#: src/msgfmt.c:1038
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 msgstr ""
-"  -c, --check                 進行以下所有的檢查：\n"
-"                                --check-format, --check-header, --check-domain\n"
+"  -c, --check                 進行所有檢查，也就等於指定以下三個選項：\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
-#: src/msgfmt.c:750
+#: src/msgfmt.c:1041
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查各種程式語言的格式字串\n"
 
-#: src/msgfmt.c:752
+#: src/msgfmt.c:1043
 #, c-format
-msgid "      --check-header          verify presence and contents of the header entry\n"
+msgid ""
+"      --check-header          verify presence and contents of the header "
+"entry\n"
 msgstr "      --check-header          確保標頭欄位存在和內容正確\n"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 "      --check-domain          檢查 domain 關鍵字和 --output-file 選項之間\n"
-"                                有沒有衝突\n"
+"                                是否衝突\n"
 
-#: src/msgfmt.c:757
+#: src/msgfmt.c:1048
 #, c-format
-msgid "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n"
-msgstr "  -C, --check-compatibility   確保 GNU msgfmt 運作的方式和 X/Open msgfmt 兼容\n"
+msgid ""
+"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
+"msgfmt\n"
+msgstr ""
+"  -C, --check-compatibility   確保 GNU msgfmt 運作的方式和 X/Open msgfmt 相"
+"容\n"
 
-#: src/msgfmt.c:759
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators for\n"
+"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
+"for\n"
 "                                menu items\n"
-msgstr "      --check-accelerators[=CHAR]  檢查選單項目中代表捷徑鍵的字元\n"
+msgstr "      --check-accelerators[=字元]  檢查選單項目的鍵盤快捷鍵是否存在\n"
 
-#: src/msgfmt.c:762
+#: src/msgfmt.c:1053
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:767
+#: src/msgfmt.c:1058
 #, c-format
-msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr "  -a, --alignment=數字        以<數字>個位元組為單位配置字串位置(預設：%d)\n"
+msgid ""
+"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
+msgstr ""
+"  -a, --alignment=數字        以 <數字> 個位元組為單位對齊字串 (預設值：%d)\n"
 
-#: src/msgfmt.c:769
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte order\n"
-"                                (big or little, default depends on platform)\n"
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
 msgstr ""
+"      --endianness=BYTEORDER  以指定位元組序輸出 32 位數\n"
+"                                (big 還是 little 取決於系統平台)\n"
 
-#: src/msgfmt.c:772
+#: src/msgfmt.c:1063
 #, c-format
-msgid "      --no-hash               binary file will not include the hash table\n"
-msgstr "      --no-hash               二元碼檔不會包含雜湊表 (hash table) 在內\n"
+msgid ""
+"      --no-hash               binary file will not include the hash table\n"
+msgstr "      --no-hash               二元碼檔將不包含雜湊表 (hash table)\n"
 
-#: src/msgfmt.c:781
+#: src/msgfmt.c:1072
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊息的統計\n"
 
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:1074 src/msgmerge.c:670 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               顯示詳細資訊\n"
+msgstr "  -v, --verbose               讓輸出的訊息更加詳細\n"
 
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1185
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "警告：缺少了 PO 檔的標頭或是格式無效\n"
+msgstr "警告：缺少 PO 檔標頭，或是格式無效\n"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1187
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "警告：字元集轉換的功能不會生效\n"
-
-#: src/msgfmt.c:910
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr "警告：PO 檔的標頭仍然是模糊狀態\n"
-
-#: src/msgfmt.c:912
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "警告：較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
+msgstr "警告：字元集轉換功能將不會生效\n"
 
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1211
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "領域名稱 %s 不適合作為檔案名稱"
+msgstr "領域名稱「%s」不適合作為檔案名稱"
 
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1216
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "領域名稱 %s 不適合作為檔案名稱：將使用字首"
+msgstr "領域名稱「%s」不適合當作檔案名稱：將使用前置詞"
 
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1230
+#, c-format
 msgid "'domain %s' directive ignored"
-msgstr "忽略‘domain %s’指令"
+msgstr "已忽略「domain %s」指令"
 
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1290
+#, c-format
 msgid "empty 'msgstr' entry ignored"
-msgstr "忽略空的‘msgstr’欄位"
+msgstr "已忽略空的「msgstr」項目"
 
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1291
+#, c-format
 msgid "fuzzy 'msgstr' entry ignored"
-msgstr "忽略模糊的‘msgstr’欄位"
+msgstr "已忽略模糊的「msgstr」項目"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1339
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s：警告：原始檔包含模糊翻譯條目"
+msgstr "%s：警告：來源檔案包含模糊翻譯條目"
+
+#: src/msgfmt.c:1455
+#, c-format
+msgid "%s does not exist"
+msgstr "%s 不存在"
+
+#: src/msgfmt.c:1462
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s 存在但不可讀"
 
-#: 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:834
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
-#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
-#: src/x-php.c:163 src/x-python.c:176 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-vala.c:174
-#: src/x-ycp.c:91
+#: src/msggrep.c:259 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:608 src/read-stringtable.c:98 src/x-awk.c:138
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:184
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:257 src/x-perl.c:332 src/x-perl.c:425 src/x-php.c:162
+#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171
+#: src/x-sh.c:163 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177
+#: src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "讀取 %s 時出現錯誤"
+msgstr "讀取「%s」時發生錯誤"
 
-#: 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:501
+#, 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:516
+#: src/msggrep.c:521
 #, 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"
+msgstr "擷取翻譯檔中的訊息，而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
 
-#: src/msggrep.c:542
-#, fuzzy, c-format, no-wrap
+#: src/msggrep.c:547
+#, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -1962,62 +2397,74 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 "訊息選擇：\n"
-"  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
-"  [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n"
+"  [-N 來源檔案]… [-M 領域]…\n"
+"  [-J MSGCTXT模式] [-K MSGID模式] [-T MSGSTR模式]\n"
+"  [-C 註解模式] [-X 擷取註解模式]\n"
+"若訊息來自指定的來源檔案之一、\n"
+"或者來自指定領域之一、或者指定了 -J，且訊息的內文 (msgctxt) 符合 <MSGCTXT模式>、\n"
+"或者指定了 -K，且訊息的鍵值 (msgid 或 msgid_plural) 符合 <MSGID樣式>、\n"
+"或者指定了 -T，且訊息的翻譯 (msgstr) 符合 <MSGSTR樣式>、\n"
+"或者指定了 -C，且訊息的翻譯者註解符合 <註解模式>、\n"
+"或者指定了 -X，且訊息的擷取註解符合 <擷取註解模式>。\n"
 "\n"
-"程式會依據以下其中一個標準來選擇翻譯訊息：\n"
-"* 指定的原始檔\n"
-"* 指定的文字領域\n"
-"* 使用了選項 -K，而原文 (msgid or msgid_plural) 符合 MSGID-PATTERN\n"
-"* 使用了選項 -T，而翻譯字句 (msgstr) 符合 MSGSTR-PATTERN\n"
-"* 使用了選項 -C，而翻譯註解符合 COMMENT-PATTERN\n"
+"如果指定了超過一種選擇標準，最後所選擇的訊息組合將是每個標準所選出\n"
+"訊息的集和。\n"
 "\n"
-"若指定了兩個或以上的選擇標準，訊息最少只要符合其中一個標準就已經足夠。\n"
+"<MSGCTXT模式>、<MSGID模式> 或 <MSGSTR模式>、<註解模式>、\n"
+"<擷取註解模式> 所使用的語法：\n"
+"  [-E | -F] [-e 模式 | -f 檔案]…\n"
+"<模式> 預設是指基本的正規表示式，或擴展正規表示式\n"
+"(如果給出 -E 的話)，或者固定的字串 (如果給出 -F 的話)。\n"
 "\n"
-"MSGID-PATTERN 或 MSGSTR-PATTERN 或 COMMENT-PATTERN 的語法：\n"
-"  [-E | -F] [-e PATTERN | -f FILE]...\n"
-"PATTERN 內定是基礎常規運算式 (basic regular expression)，\n"
-"如果指定 -E 則是延伸常規運算式 (extended regular expression)，\n"
-"如果指定 -F 則是普通字串。\n"
-"\n"
-"  -N, --location=SOURCEFILE   選擇自 SOURCEFILE 抽取出來的翻譯訊息\n"
-"  -M, --domain=DOMAINNAME     選擇屬於 DOMAINNAME 領域的翻譯訊息\n"
-"  -K, --msgid                 指定符合 msgid 的樣式\n"
-"  -T, --msgstr                指定符合 msgstr 的樣式\n"
-"  -C, --comment               指定符合翻譯註釋的樣式\n"
-"  -E, --extended-regexp       指定 PATTERN 為延伸常規運算式\n"
-"  -F, --fixed-strings         指定 PATTERN 為普通字串\n"
-"  -e, --regexp=PATTERN        指定 PATTERN 為基礎常規運算式\n"
-"  -f, --file=FILE             PATTERN 採用 FILE 的內容 \n"
+"  -N, --location=來源檔案       選擇的訊息擷取自 <來源檔案>\n"
+"  -M, --domain=領域            選擇的訊息屬於 <領域>\n"
+"  -J, --msgctxt               msgctxt 的開頭\n"
+"  -K, --msgid                 msgid 的開頭\n"
+"  -T, --msgstr                msgstr 的開頭\n"
+"  -C, --comment               翻譯者註解的開頭\n"
+"  -X, --extracted-comment     擷取註解的開頭\n"
+"  -E, --extended-regexp       為擴展正規表示式的 <模式>\n"
+"  -F, --fixed-strings         使用換行字元分隔字串組合的 <模式>\n"
+"  -e, --regexp=模式            將 <模式> 當作正規表示式使用\n"
+"  -f, --file=檔案              從 <檔案> 取得 <模式>\n"
 "  -i, --ignore-case           不區分大小寫\n"
+"  -v, --invert-match          僅輸出不符合任何條件的訊息\n"
 
-#: src/msggrep.c:597
+#: src/msggrep.c:602
 #, c-format
-msgid "      --escape                use C escapes in output, no extended chars\n"
+msgid ""
+"      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                在輸出結果中使用 C 轉義控制序列 (escape sequence)\n"
+"      --escape                在輸出結果中使用 C 轉義控制序列 (escape "
+"sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msggrep.c:618
+#: src/msggrep.c:623
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           將訊息排序\n"
+msgstr "      --sort-output           排序訊息\n"
 
-#: src/msggrep.c:620
+#: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根據檔案位置排序\n"
 
-#: src/msginit.c:297
+#: src/msginit.c:299
+#, fuzzy, c-format
+#| 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"
 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"
+"your LANG environment variable, as described in\n"
+"<%s>.\n"
+"This is necessary so you can test your translations.\n"
 msgstr ""
-"系統環境沒有任何和語言有關的設定。請根據 ABOUT-NLS 檔案所述，\n"
-"設定 LANG 環境變數。這是測試翻譯時的必要步驟。\n"
+"系統環境沒有任何和語言有關的設定。請根據 ABOUT-NLS 檔案所述\n"
+"設定 LANG 環境變數。這是測試翻譯的必要步驟。\n"
 
-#: src/msginit.c:321
+#: src/msginit.c:325
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2025,154 +2472,164 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 "輸出檔 %s 已經存在。\n"
-"請透過 --locale 選項指定語系或\n"
+"請透過 --locale 選項指定語系或透過\n"
 "--output-file 選項指定輸出的 .po 檔。\n"
 
-#: src/msginit.c:347
+#: src/msginit.c:351
 #, c-format
 msgid "Created %s.\n"
 msgstr "已建立 %s。\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:371
 #, 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"
+msgstr "建立新的 PO 檔，並由使用者環境取得初始化所需的標頭資料。\n"
 
-#: src/msginit.c:377
+#: src/msginit.c:381
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=輸入檔          輸入的 POT 檔\n"
+msgstr "  -i, --input=輸入檔           輸入的 POT 檔\n"
 
-#: src/msginit.c:379
+#: src/msginit.c:383
 #, c-format
 msgid ""
-"If no input file is given, the current directory is searched for the POT file.\n"
+"If no input file is given, the current directory is searched for the POT "
+"file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
 "如果沒有指定輸入檔，會在目前的目錄搜尋 POT 檔。\n"
 "如果輸入檔是 -，則讀取標準輸入的內容。\n"
 
-#: src/msginit.c:385
+#: src/msginit.c:389
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      將輸出的內容寫入指定的 PO 檔\n"
 
-#: src/msginit.c:387
+#: src/msginit.c:391
 #, 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 ""
-"如果沒有指定輸出檔，檔名將會由 --locale 選項或使用者的語系決定。\n"
+"如果沒有指定輸出檔，檔名將會取決於 --locale 選項或使用者的語系。\n"
 "如果輸出檔是 -，則會將結果寫至標準輸出。\n"
 
-#: src/msginit.c:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          指定地區設定\n"
+#: src/msginit.c:404
+#, fuzzy, c-format
+#| msgid "  -l, --locale=LL_CC          set target locale\n"
+msgid "  -l, --locale=LL_CC[.ENCODING]  set target locale\n"
+msgstr "  -l, --locale=LL_CC          指定目標檔案語系\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:406
 #, c-format
-msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgid ""
+"      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假設 PO 檔是自動產生的\n"
 
-#: src/msginit.c:468
+#: src/msginit.c:472
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "找到多於一個的 .pot 檔。\n"
-"請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
+"請透過 --input 選項指定要當作輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:480 src/msginit.c:485
 #, c-format
 msgid "error reading current directory"
-msgstr "讀取目前的目錄時發生錯誤"
+msgstr "讀取目前目錄時發生錯誤"
 
-#: src/msginit.c:489
+#: src/msginit.c:493
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 "在目前目錄中找不到任何 .pot 檔。\n"
-"請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
+"請透過 --input 選項指定要作為輸入檔的 .pot 檔。\n"
 
-#: 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
+#: src/msginit.c:917 src/msginit.c:992 src/msginit.c:1152 src/msginit.c:1247
+#: src/msginit.c:1426 src/read-csharp.c:83 src/read-java.c:82
+#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106
 #, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "%s 副行程失敗，錯誤碼為 %d"
+msgstr "%s 子行程失敗，錯誤碼為 %d"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1117
 msgid ""
-"The new message catalog should contain your email address, so that users can\n"
-"give you feedback about the translations, and so that maintainers can contact\n"
+"The new message catalog should contain your email address, so that users "
+"can\n"
+"give you feedback about the translations, and so that maintainers can "
+"contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"新的翻譯檔應該含有您的電郵地址，這樣使用者就可以對您的翻譯提出意見，\n"
-"同時軟件維護者也可以在出現技術問題時聯絡您。\n"
+"新的翻譯檔應該含有您的電子信箱位址，這樣使用者就可以對您的翻譯提出意見，\n"
+"同時軟體維護者也可以在出現技術問題時聯絡您。\n"
 
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1621
 #, c-format
 msgid "English translations for %s package"
-msgstr "%s 套件的傳統字漢語翻譯"
+msgstr "%s 套件的正體中文翻譯"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "目前的字元集編碼 %s 不是通用的編碼名稱"
+msgstr "目前的字元集編碼「%s」不是通用的編碼名稱"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:188 src/msgl-iconv.c:258
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "輸入檔有兩種不同的字元集編碼 %s 和 “%s”"
+msgstr "輸入檔有兩種不同的字元集編碼「%s」和「%s」"
 
 #: src/msgl-cat.c:203
-#, fuzzy, c-format
-msgid "input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "輸入檔‘%s’的標頭欄位中沒有指定字元集"
+#, c-format
+msgid ""
+"input file '%s' doesn't contain a header entry with a charset specification"
+msgstr "輸入檔案「%s」不包含指定字元集的檔案標頭"
 
 #: 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 "輸入檔 ‘%2$s’ 的 domain “%1$s” 的標頭欄位中沒有指定字元集"
+#, c-format
+msgid ""
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
+"charset specification"
+msgstr "輸入檔案「%2$s」的領域「%1$s」不包含指定字元集的檔案標頭"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:366
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "目標的字元集編碼 %s 不是通用的編碼名稱。"
+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:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:91
+#: src/msgl-charset.c:126 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:566 src/xgettext.c:1871
 #, c-format
 msgid "warning: "
 msgstr "警告："
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
-msgstr "輸入檔含有不同編碼的訊息，其中一種是 UTF-8。會將輸出的編碼轉換為 UTF-8。\n"
+msgstr ""
+"輸入檔含有不同編碼的訊息，其中一種是 UTF-8。將會把輸出的編碼轉換為 UTF-8。\n"
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
-"Input files contain messages in different encodings, %s and %s among others.\n"
+"Input files contain messages in different encodings, %s and %s among "
+"others.\n"
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"輸入檔含有不同編碼的訊息，其中包括 %s 和 %s。會將輸出的編碼轉換為 UTF-8。\n"
+"輸入檔含有不同編碼的訊息，其中包括 %s 和 %s。將會把輸出的編碼轉換為 UTF-8。\n"
 "若要選擇另一種輸出編碼，請使用 --to-code 選項。\n"
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2180,8 +2637,11 @@ msgid ""
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
+"將檔案 %s 由 %s 編碼轉換為 %s 編碼將變更部份 msgid 或 msgctxt。\n"
+"請將全部的 msgid 和 msgctxt 都轉換為純 ASCII 字元，\n"
+"或者確保來源（換句話說就是原始碼檔）是使用 UTF-8 編碼的。\n"
 
-#: src/msgl-charset.c:93
+#: src/msgl-charset.c:92
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2189,27 +2649,27 @@ msgid ""
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"目前語系的字元集“%s”和輸入檔的字元集“%s”不同。\n"
-"‘%s’的輸出可能有誤。\n"
+"目前語系的字元集「%s」和輸入檔的字元集「%s」不同。\n"
+"「%s」的輸出可能有誤。\n"
 "可行的解決方法包括：\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:99
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- 設定 LC_ALL 環境變數為使用編碼 %s 的語系。\n"
+msgstr "- 設定 LC_ALL 環境變數至使用編碼 %s 的語系。\n"
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:104
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- 用 ‘msgconv’ 將翻譯檔的字元集轉換為 %s，\n"
-"  然後套用 ‘%s’ 指令過濾內容，\n"
-"  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
+"- 用「msgconv」將翻譯檔的字元集轉換為 %s，\n"
+"  然後套用「%s」指令過濾內容，\n"
+"  最後再用「msgconv」將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:113
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2218,11 +2678,11 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- 設定 LC_ALL 環境變數為使用編碼 %s 的語系，\n"
-"  用 ‘msgconv’ 將翻譯檔的字元集轉換為 %s，\n"
-"  然後套用 ‘%s’ 指令過濾內容，\n"
-"  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
+"  用「msgconv」將翻譯檔的字元集轉換為 %s，\n"
+"  然後套用「%s」指令過濾內容，\n"
+"  最後再用「msgconv」將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:127
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2230,177 +2690,207 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 "語言的字元集編碼 %s 不是通用的編碼名稱。\n"
-"‘%s’ 的輸出可能有誤。\n"
+"「%s」的輸出可能有誤。\n"
 "設定 LC_ALL=C 是一個可行的解決方法。\n"
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
-msgstr "複數表示式可能產生負數"
+msgstr "複數表示式可能產生負數值"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu，但複數表示式的最大值可能等於 %lu"
+msgstr "nplurals = %lu，但複數表示式可能產生最大為 %lu 的值"
 
-#: src/msgl-check.c:187
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
-msgstr "複數表示式會引致被 0 整除的錯誤"
+msgstr "複數表示式會導致被 0 整除的錯誤"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
-msgstr "複數表示式會引致整數溢位的錯誤"
+msgstr "複數表示式會導致整數溢位的錯誤"
 
-#: src/msgl-check.c:197
-msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
-msgstr "複數表示式會引致運算錯誤，例如被 0 整除"
+#: src/msgl-check.c:201
+msgid ""
+"plural expression can produce arithmetic exceptions, possibly division by "
+"zero"
+msgstr "複數表示式會導致運算錯誤，可能被 0 整除"
 
-#: src/msgl-check.c:266
-#, fuzzy, c-format
+#: src/msgl-check.c:270
+#, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "嘗試使用下列 %s 中屬於合法的型態:\n"
+msgstr "請嘗試使用下面的方法，對 %s 有效："
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
-#, fuzzy
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
-msgstr "翻譯檔含有複數型態的翻譯..."
+msgstr "訊息庫有複數形式的翻譯"
 
-#: src/msgl-check.c:360
-#, fuzzy
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...但檔頭缺少了像 “plural=表示式” 的項目"
+msgstr "但是檔案標頭中缺少「plural=表達式」屬性"
 
-#: src/msgl-check.c:384
-#, fuzzy
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...但檔頭缺少了像 “nplurals=整數” 的項目"
+msgstr "但是檔案標頭中缺少「nplurals=整數」屬性"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
-msgstr "無效的 nplurals 值"
+msgstr "nplurals 值無效"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "無效的複數表示式"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
+#: src/msgl-check.c:476 src/msgl-check.c:492
+#, c-format
 msgid "nplurals = %lu"
-msgstr "nplurals = %lu..."
+msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
-#, fuzzy, c-format
+#: src/msgl-check.c:478
+#, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "...但某些訊息只有 %lu 種複數型態"
+msgstr[0] "但是某些訊息只有 %lu 種複數形式"
 
-#: src/msgl-check.c:490
-#, fuzzy, c-format
+#: src/msgl-check.c:494
+#, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "...但某些訊息有 %lu 種複數型態"
+msgstr[0] "但是某些訊息有 %lu 種複數形式"
 
-#: src/msgl-check.c:514
-msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:518
+msgid ""
+"message catalog has plural form translations, but lacks a header entry with "
+"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 "翻譯檔含有複數型態的翻譯，但缺少了以下的標頭欄位：\n"
-"“Plural-Forms: nplurals=<整數>; plural=<表示式>;”"
+"「Plural-Forms: nplurals=整數; plural=表示式;」"
 
-#: src/msgl-check.c:611
-#, fuzzy
+#: src/msgl-check.c:616
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid' 和 `msgid_plural' 欄位並非同時以 '\\n' 開始"
+msgstr "「msgid」和「msgid_plural」項並非都以「\\n」開始"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
+#: src/msgl-check.c:623
+#, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’開始"
+msgstr "「msgid」和「msgstr[%u]」項並非都以「\\n」開始"
 
-#: src/msgl-check.c:634
-#, fuzzy
+#: src/msgl-check.c:639
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’開始"
+msgstr "「msgid」和「msgstr」項並非都以「\\n」開始"
 
-#: src/msgl-check.c:652
-#, fuzzy
+#: src/msgl-check.c:657
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "‘msgid’和‘msgid_plural’欄位並非同時以‘\\n’結束"
+msgstr "「msgid」和「msgid_plural」項並非都以「\\n」結束"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
+#: src/msgl-check.c:664
+#, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’結束"
+msgstr "「msgid」和「msgstr[%u]」項並非都以「\\n」結束"
 
-#: src/msgl-check.c:675
-#, fuzzy
+#: src/msgl-check.c:680
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’結束"
+msgstr "「msgid」和「msgstr」項並非都以「\\n」結束"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:692
 msgid "plural handling is a GNU gettext extension"
-msgstr "複數處理是 GNU gettext 的擴展功能"
+msgstr "複數處理是 GNU gettext 的擴充功能"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
+msgstr "msgstr 缺少快捷鍵標記「%c」"
 
-#: src/msgl-check.c:739
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
+msgstr "msgstr 含有過多的快捷鍵標記「%c」"
 
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:818
+#, c-format
 msgid "header field '%s' still has the initial default value\n"
-msgstr "某些標頭欄位仍然是預設值\n"
+msgstr "標頭「%s」仍然是初始預設值\n"
 
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:835
+#, c-format
 msgid "header field '%s' missing in header\n"
-msgstr "缺少了標頭欄位‘%s’\n"
+msgstr "標頭缺少標頭欄位「%s」\n"
+
+#: src/msgl-check.c:940
+msgid "ASCII ellipsis ('...') instead of Unicode"
+msgstr "ASCII 省略號（'...'）而非其 Unicode 版本"
+
+#: src/msgl-check.c:1013
+msgid "space before ellipsis found in user visible strings"
+msgstr "在使用者可視字串中的省略號前發現空格"
+
+#: src/msgl-check.c:1041
+msgid "ASCII double quote used instead of Unicode"
+msgstr "ASCII 雙引號代替了 Unicode 雙引號"
+
+#: src/msgl-check.c:1047
+msgid "ASCII single quote used instead of Unicode"
+msgstr "ASCII 單引號代替了 Unicode 單引號"
+
+#: src/msgl-check.c:1162
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII 圓點（'%c'）而非其 Unicode 版本"
 
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "%s：對「%s」編碼而言，輸入的內容無效"
 
-# 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
+# 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 #, fuzzy, c-format
 #: src/msgl-iconv.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
+msgstr "%s：當要從「%s」編碼方式轉換到「%s」編碼方式時發生錯誤"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:288
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄位"
 
-#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:708
+#: src/msgl-iconv.c:302 src/recode-sr-latin.c:288 src/recode-sr-latin.c:292
+#: src/xgettext.c:787 src/x-python.c:599
 #, c-format
-msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
-msgstr "不支援將字元集由 %s 轉換至 “%s”。%s 需要 iconv()，但 iconv() 不支援此種轉換方式。"
+msgid ""
+"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
+"not support this conversion."
+msgstr ""
+"不支援將字元集由 %s 轉換至「%s」。%s 需要 iconv()，但 iconv() 不支援此種轉換"
+"方式。"
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:330
 #, c-format
-msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."
-msgstr "由 %s 轉換至 %s 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"由 %s 轉換至 %s 會產生重複訊息：有些原本不同的 msgid 轉換後會將會變成相同 "
+"msgid。"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
+#: src/msgl-iconv.c:334 src/recode-sr-latin.c:300 src/xgettext.c:793
+#: src/x-python.c:605
 #, 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() 支援。"
+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:383 src/msgmerge.c:389
+#: src/msgmerge.c:426 src/msgmerge.c:432
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s 只能和 %s 配合一起使用才有效"
+msgstr "%s 只能和 %s 一起使用才有效"
 
-#: src/msgmerge.c:448
+#: src/msgmerge.c:508
 msgid "backup type"
-msgstr "備份方式"
+msgstr "備份類型"
 
-#: src/msgmerge.c:485
+#: src/msgmerge.c:545
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2413,112 +2903,124 @@ msgid ""
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"合併兩個 Uniforum 格式的 .po 檔。def.po 是舊的 PO 檔，裡面的翻譯訊息只要\n"
-"和新產生的檔案條目符合，都會被合併進去；合併時會保留自行加上的註解，不過\n"
-"會捨棄原程式碼的註解和檔案位置。ref.pot 可以是有最新來源條目但只含有舊翻譯\n"
+"合併兩個 Uniforum 格式的 .po 檔。def.po 是原本的 PO 檔，裡面的翻譯訊息只要\n"
+"和新產生的檔案條目符合，都會被合併進去；合併時仍會保留自行加上的註解，不過\n"
+"會捨棄原程式碼的註解和檔案位置。ref.pot 可以是有最新參考來源但只含有舊翻譯\n"
 "的 PO 檔，或是一個 POT 檔 (通常由 xgettext 產生)；任何翻譯後的訊息或檔案裡\n"
 "的註解都會被捨棄，但特殊旗標註解和檔案位置都會被保留。比較時如果有不完全\n"
-"配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
+"配合的字串出現，程式會以模糊比對的方式得出較好的結果。\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:562
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      舊版本的翻譯檔\n"
+msgstr "  def.po                      參考舊來源訊息的翻譯檔\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:564
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     新版本程式的翻譯檔\n"
+msgstr "  ref.pot                     參考新來源訊息的翻譯檔\n"
 
-#: src/msgmerge.c:508
+#: src/msgmerge.c:568
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
-msgstr "  -C, --compendium=FILE       額外的翻譯記憶庫，選項可以使用多次\n"
+msgstr "  -C, --compendium=FILE       額外的翻譯庫，選項可以使用多次\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:574
 #, 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:526
+#: src/msgmerge.c:586
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "更新模式的檔案輸出位置：\n"
 
-#: src/msgmerge.c:528
+#: src/msgmerge.c:588
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "輸出結果會寫入至 def.po。\n"
+msgstr "輸出結果會寫入 def.po。\n"
 
-#: src/msgmerge.c:530
+#: src/msgmerge.c:590
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=CONTROL        將 def.po 備份\n"
+msgstr "      --backup=CONTROL        備份 def.po\n"
 
-#: src/msgmerge.c:532
+#: src/msgmerge.c:592
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         自行指定備份檔名末端的字串\n"
 
-#: src/msgmerge.c:534
+#: src/msgmerge.c:594
 #, c-format
 msgid ""
-"The version control method may be selected via the --backup option or through\n"
+"The version control method may be selected via the --backup option or "
+"through\n"
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"版本控制的方式可透過 --backup 選項或 VERSION_CONTROL 環境變數來選擇。\n"
+"版本控制的方式可透過 --backup 選項或 VERSION_CONTROL 環境變數選擇。\n"
 "以下是可用的變數值：\n"
 "  none, off       即使使用了 --backup 選項仍不會備份\n"
-"  numbered, t     備份檔名加上數字\n"
-"  existing, nil   若有數字的備份檔已經存在則使用數字，否則使用一般名稱\n"
-"  simple, never   永遠使用普通方式備份\n"
+"  numbered, t     建立有數字的備份檔名\n"
+"  existing, nil   若已存在有數字的備份檔則使用數字，否則使用一般名稱\n"
+"  simple, never   永遠使用簡易方式備份\n"
 
-#: src/msgmerge.c:541
-#, fuzzy, c-format
+#: src/msgmerge.c:601
+#, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
+"The backup suffix is '~', unless set with --suffix or the "
+"SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"備份檔的後置字元為‘~’，除非以 --suffix 選項或是 SIMPLE_BACKUP_SUFFIX\n"
-"環境變數指定。\n"
+"除非設定 --suffix 或 SIMPLE_BACKUP_SUFFIX 環境變數，否則備份後置詞總為「~」\n"
 
-#: src/msgmerge.c:552
+#: src/msgmerge.c:610
 #, fuzzy, c-format
-msgid "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
+#| msgid "      --boost                 recognize Boost format strings\n"
+msgid ""
+"      --for-msgfmt            produce output for '%s', not for a translator\n"
+msgstr "      --boost                 識別 Boost 格式字串\n"
+
+#: src/msgmerge.c:615
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr "      --previous              保留已翻譯條目的 msgid\n"
 
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:672 src/urlget.c:191
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       隱藏進度指示\n"
+msgstr "  -q, --quiet, --silent       隱藏進度指示器\n"
 
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1685
 #, c-format
 msgid "this message should define plural forms"
-msgstr "此訊息應該有複數型態"
+msgstr "此訊息應要有複數型態"
 
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1706
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此訊息不應有複數型態"
 
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2110
 #, c-format
-msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2118 src/urlget.c:294 src/urlget.c:341 src/urlget.c:383
+#: src/urlget.c:425
 #, c-format
 msgid " done.\n"
 msgstr " 完成。\n"
@@ -2531,7 +3033,7 @@ msgstr "使用 %s 不能同時指定檔案名稱"
 #: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "用法：%s [選項] [檔案]...\n"
+msgstr "用法：%s [選項] [檔案]…\n"
 
 #: src/msgunfmt.c:431
 #, c-format
@@ -2540,8 +3042,11 @@ msgstr "將二元碼翻譯檔轉換為 Uniforum 型式的 .po 檔。\n"
 
 #: src/msgunfmt.c:440
 #, c-format
-msgid "  -j, --java                  Java mode: input is a Java ResourceBundle class\n"
-msgstr "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  Java 模式：產生 Java ResourceBundle 類別\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -2550,18 +3055,24 @@ msgstr "      --csharp                C# 模式：輸入檔是 .NET .dll 檔\n"
 
 #: src/msgunfmt.c:444
 #, c-format
-msgid "      --csharp-resources      C# resources mode: input is a .NET .resources file\n"
-msgstr "      --csharp-resources      C# resources 模式：輸入內容是 .NET .resources 檔案\n"
+msgid ""
+"      --csharp-resources      C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"      --csharp-resources      C# 資源檔模式：輸入內容是 .NET .resources 檔"
+"案\n"
 
 #: 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"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   Tcl 模式：輸入資料是 tcl/msgcat .msg 檔\n"
 
 #: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  檔案 ...                    作為輸入的 .mo 檔\n"
+msgstr "  檔案 …                      作為輸入的 .mo 檔\n"
 
 #: src/msgunfmt.c:456
 #, c-format
@@ -2571,10 +3082,11 @@ msgstr "Java 模式的輸入檔位置：\n"
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
+"類型名稱是由語言名稱和資源名稱合併來決定的，兩者之間會用底線分隔。\n"
 "class 檔會在 CLASSPATH 變數所指定的目錄中搜尋。\n"
 
 #: src/msgunfmt.c:467
@@ -2588,6 +3100,8 @@ 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 ""
+"-l 和 -d 選項是必要的。.dll 檔案位於指定目錄的子目錄，而子目錄的名稱取決於語"
+"系。\n"
 
 #: src/msgunfmt.c:479
 #, c-format
@@ -2599,19 +3113,19 @@ msgstr "Tcl 模式的輸入檔位置：\n"
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
-msgstr ""
+msgstr "-l 和 -d 選項是必要的。所產生的 .msg 檔案會存放在指定的目錄。\n"
 
 #: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                將輸出結果進行縮排\n"
+msgstr "  -i, --indent                縮排輸出結果\n"
 
 #: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                輸出結果嚴格遵從 Uniforum 格式\n"
 
-#: src/msguniq.c:330
+#: src/msguniq.c:331
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2624,22 +3138,25 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 "統一翻譯檔裡重複出現的條目。\n"
-"它會搜尋重複的條目，這些條目會令 msgfmt、msgmerge 或 msgcat 等的程式無法\n"
-"正常處理翻譯條目。在預設模式中，重複的條目會合併在一起。使用 --repeated \n"
-"選項時，只會顯示重複的條目而捨棄其它條目。\n"
-"自行加上的註解和原程式碼的註解都會累積；除非使用 --use-first 選項，那樣\n"
+"它會搜尋有著相同條目 ID 的翻譯，這些條目會令 msgfmt、msgmerge 或 msgcat 等的程式無法\n"
+"正常處理翻譯條目。在預設模式中，重複的條目會合併在一起。若使用 --repeated\n"
+"選項，則只輸出重複的條目而捨棄其它條目。\n"
+"將會累積自行加上的註解和擷取到的程式碼的註解；除非使用 --use-first 選項，那樣\n"
 "則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
 "當使用 --unique 選項時，則會捨棄任何重複的翻譯條目。\n"
 
-#: src/msguniq.c:363
+#: src/msguniq.c:364
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只顯示重複條目\n"
 
-#: src/msguniq.c:365
+#: src/msguniq.c:366
 #, c-format
-msgid "  -u, --unique                print only unique messages, discard duplicates\n"
-msgstr "  -u, --unique                只顯示出現一次的條目，捨棄任何重複的條目\n"
+msgid ""
+"  -u, --unique                print only unique messages, discard "
+"duplicates\n"
+msgstr ""
+"  -u, --unique                只顯示出現一次的條目，捨棄任何重複的條目\n"
 
 #: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -2652,7 +3169,7 @@ msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"字元集“%s”不是通用的編碼名稱。\n"
+"字元集「%s」不是通用的編碼名稱。\n"
 "轉換訊息至使用者字元集的功能將不會運作。\n"
 
 #: src/po-charset.c:557
@@ -2661,18 +3178,18 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"不支援字元集 “%s”。%s 需要 iconv()，\n"
-"但 iconv() 不支援 “%s”。\n"
+"不支援字元集「%s」。%s 需要 iconv()，\n"
+"但 iconv() 不支援「%s」。\n"
 
 #: src/po-charset.c:564 src/po-charset.c:612
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
-msgstr "先安裝 GNU libiconv，然後再安裝 GNU gettext，將會修正此問題。\n"
+msgstr "先安裝 GNU libiconv，然後再安裝 GNU gettext，就應該能修正此問題。\n"
 
 #: src/po-charset.c:578 src/po-charset.c:616
 msgid "Continuing anyway, expect parse errors."
-msgstr "仍會繼續執行，但預計解析內容時會出現錯誤。"
+msgstr "仍會繼續執行，但預期會出現解析發生錯誤。"
 
 #: src/po-charset.c:580
 msgid "Continuing anyway."
@@ -2684,53 +3201,53 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"不支援字元集 “%s”。%s 需要 iconv()，\n"
-"但編譯此程式時沒有 iconv() 支援。\n"
+"不支援字元集「%s」。%s 需要 iconv()，\n"
+"但編譯此程式時未編譯 iconv() 支援。\n"
 
 #: src/po-charset.c:644
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"檔頭缺少了指定字元集的欄位。\n"
+"標頭缺少了指定字元集的欄位。\n"
 "轉換訊息至使用者字元集的功能將不會生效。\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
-msgstr "不一致地使用 #~"
+msgstr "#~ 使用不一致"
 
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:241
+#, c-format
 msgid "missing 'msgstr[]' section"
-msgstr "缺少了 ‘msgstr[]’ 段落"
+msgstr "缺少「msgstr[]」部份"
 
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:250
+#, c-format
 msgid "missing 'msgid_plural' section"
-msgstr "缺少了 ‘msgid_plural’ 段落"
+msgstr "缺少「msgid_plural」部份"
 
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:258
+#, c-format
 msgid "missing 'msgstr' section"
-msgstr "缺少了 ‘msgstr’ 段落"
+msgstr "缺少「msgstr」部份"
 
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "第一個複數格式的索引數字不是 0"
 
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
-msgstr "複數格式含有錯誤的索引數字"
+msgstr "複數格式含有錯誤的索引數位"
 
 #: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "錯誤太多，必須中斷作業"
+msgstr "錯誤過多，決定中斷作業"
 
-#: 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:505 src/write-po.c:812 src/write-po.c:949
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "無效的位元組序列"
@@ -2738,275 +3255,321 @@ msgstr "無效的位元組序列"
 #: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "檔案末端出現不完整的位元組序列"
+msgstr "檔案尾端出現不完整的位元組序列"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:474
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "行末出現不完整的位元組序列"
+msgstr "行尾出現不完整的位元組序列"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:485
 msgid "iconv failure"
 msgstr "iconv 失敗"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:742
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "不明的關鍵字“%s”"
+msgstr "關鍵字「%s」未知"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:852
 #, c-format
 msgid "invalid control sequence"
-msgstr "無效的控制序列"
+msgstr "控制序列無效"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:979
 #, c-format
 msgid "end-of-file within string"
 msgstr "檔案在字串中段突然結束"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:985
 #, c-format
 msgid "end-of-line within string"
-msgstr "字串中間突然斷行"
+msgstr "字串中段突然斷行"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1006
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr ""
+msgstr "內文分隔符 <EOT> 出現於字串中"
 
-#: src/read-catalog.c:332 src/xgettext.c:1023
+#: src/read-catalog.c:325 src/xgettext.c:1228
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
 
-#: src/read-catalog.c:377
+#: src/read-catalog.c:370
 msgid "duplicate message definition"
 msgstr "訊息被重複定義"
 
-#: src/read-catalog.c:379
-#, fuzzy
+#: src/read-catalog.c:372
 msgid "this is the location of the first definition"
-msgstr "...這是第一次定義的位置"
+msgstr "這是第一次被定義的位置"
+
+#: src/read-desktop.c:267
+msgid "unterminated group name"
+msgstr "群組名稱未結束"
+
+#: src/read-desktop.c:286
+msgid "invalid non-blank character"
+msgstr "無效的非空白字元"
+
+#: src/read-desktop.c:405
+#, c-format
+msgid "missing '=' after \"%s\""
+msgstr "「%s」後缺少「=」"
+
+#: src/read-desktop.c:468
+msgid "invalid non-blank line"
+msgstr "無效的非空白行"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:191
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "檔案 %s 被截斷了"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "檔案 %s 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 %s 包含不以 NUL 結尾的字串"
+
+#: src/read-mo.c:177
+#, fuzzy, c-format
+#| msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" contains a not NUL terminated system dependent string"
+msgstr "檔案 %s 包含不以 NUL 結尾的字串"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:183 src/read-mo.c:291
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "檔案 %s 並非 GNU .mo 格式檔案"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:197
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "檔案 %s 在 %s 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 %s 在 %s 位置包含不以 NUL 結尾的字串"
 
-#: src/read-properties.c:227
-#, fuzzy
+#: src/read-properties.c:357
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%lu: 錯誤：Unicode 字元格式 \\uxxxx 無效"
+msgstr "警告：Unicode 字元 \\uxxxx 語法無效"
+
+#: src/read-properties.c:429
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: lone surrogate U+%04X"
+msgid "warning: lone surrogate U+%04X"
+msgstr "%s:%d: 警告：發現到未結束字元 (lone surrogate) U+%04X"
+
+#: src/read-properties.c:499 src/read-properties.c:534
+msgid "warning: invalid Unicode character"
+msgstr "警告：無效的 Unicode 字元"
 
 #: src/read-stringtable.c:802
-#, fuzzy
 msgid "warning: unterminated string"
-msgstr "%s:%d: 警告：字串未完結"
+msgstr "警告：字串未結束"
 
 #: src/read-stringtable.c:810
-#, fuzzy
 msgid "warning: syntax error"
-msgstr "%s:%lu: 警告：格式錯誤"
+msgstr "警告：語法錯誤"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "%s:%d: 警告：正規表示式不完整"
+msgstr "警告：未結束的關鍵字/值對"
 
-#: src/read-stringtable.c:939
-#, fuzzy
+#: src/read-stringtable.c:940
 msgid "warning: syntax error, expected ';' after string"
-msgstr "%s:%lu: 警告：格式錯誤，字串後應出現‘;’"
+msgstr "警告：語法錯誤，預期字串後有「;」"
 
 #: src/read-stringtable.c:948
-#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "%s:%lu: 警告：格式錯誤，字串後應該出現 ‘=’ 或 ‘;’"
+msgstr "警告：語法錯誤，預期字串後有「=」或「;」"
 
-#: src/recode-sr-latin.c:116
-#, fuzzy, c-format
+#: src/recode-sr-latin.c:115
+#, c-format
 msgid "Written by %s and %s.\n"
-msgstr "由 %s 編寫。\n"
+msgstr "由 %s 和 %s 編寫。\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "&Scaron;egan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:120
+#: src/recode-sr-latin.c:119
 msgid "Danilo Segan"
-msgstr ""
+msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:152
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
+msgstr "將塞爾維亞語從西里爾文轉換為拉丁文。\n"
 
-#: src/recode-sr-latin.c:156
+#: src/recode-sr-latin.c:155
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
-msgstr ""
+msgstr "從標準輸入讀取輸入文字。將轉換後的文字輸出到標準輸出。\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:335
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "輸入無法用「%s」編碼表示"
 
-# 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/recode-sr-latin.c:367
-#, fuzzy, c-format
+# 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 #, fuzzy, c-format
+#: src/recode-sr-latin.c:363
+#, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
+msgstr "當要從「%s」編碼方式轉換到「%s」編碼方式時發生錯誤"
 
-#: src/urlget.c:159
+#: src/urlget.c:158
 #, c-format
 msgid "expected two arguments"
-msgstr "需要恰好兩個引數"
+msgstr "需要剛好兩個參數"
 
-#: src/urlget.c:176
+#: src/urlget.c:175
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "用法：%s [選項] 網址 檔案\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:180
 #, 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"
+msgstr "擷取並輸出某網址的內容。如果無法存取該網址，則使用指定可存取的本機檔案。\n"
 
-#: src/urlget.c:228
+#: src/urlget.c:227
 #, c-format
 msgid "error reading \"%s\""
-msgstr "讀取 %s 時發生錯誤"
+msgstr "讀取「%s」時發生錯誤"
 
-#: src/urlget.c:234
+#: src/urlget.c:233
 #, c-format
 msgid "error writing stdout"
-msgstr "寫入至標準輸出時發生錯誤"
+msgstr "寫入標準輸出時發生錯誤"
 
-#: src/urlget.c:238
+#: src/urlget.c:237
 #, c-format
 msgid "error after reading \"%s\""
-msgstr "完成讀取 %s 後發生錯誤"
+msgstr "讀取「%s」完成後發生錯誤"
 
-#: src/urlget.c:264
+#: src/urlget.c:263
 #, c-format
 msgid "Retrieving %s..."
-msgstr ""
+msgstr "正在取回 %s…"
 
-#: src/urlget.c:308
+#: src/urlget.c:296
 #, c-format
 msgid " timed out.\n"
-msgstr ""
+msgstr " 逾時。\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:433
 #, c-format
 msgid " failed.\n"
-msgstr ""
+msgstr " 失敗。\n"
 
-#: src/write-catalog.c:126
-#, fuzzy
-msgid "Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead."
-msgstr "不可以將多個屬於不同 domain 的翻譯訊息寫入一個 Java .properties 檔案。請改用PO 檔案格式。"
+#: src/write-catalog.c:125
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"無法使用指定輸出格式將多個翻譯檔領域輸出為單個檔案。請嘗試用 PO 檔案語法代"
+"替。"
 
-#: src/write-catalog.c:129
-#, fuzzy
-msgid "Cannot output multiple translation domains into a single file with the specified output format."
-msgstr "不可以將多個屬於不同領域的翻譯訊息寫入一個 NeXTstep/GNUstep .strings 檔案。"
+#: src/write-catalog.c:128
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr "無法使用指定輸出格式將多個翻譯檔領域輸出為單個檔案。"
 
-#: src/write-catalog.c:162
-#, fuzzy
-msgid "message catalog has context dependent translations, but the output format does not support them."
-msgstr "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
+#: src/write-catalog.c:161
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr "訊息庫有依賴內文的翻譯，但是輸出格式不支援內文。"
 
-#: src/write-catalog.c:197
-msgid "message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file."
-msgstr "翻譯檔中有複數格式的翻譯字句，但輸出格式不支援複數。請嘗試使用 “msgfmt --java” 產生 Java class，而不用 properties 檔案。"
+#: src/write-catalog.c:196
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"翻譯檔中有複數格式的翻譯字句，但輸出格式不支援複數。請嘗試使用「msgfmt --"
+"java」產生 Java 類型，\n"
+"而不用 properties 檔案。"
 
-#: src/write-catalog.c:202
-msgid "message catalog has plural form translations, but the output format does not support them."
+#: src/write-catalog.c:201
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
 msgstr "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:274 src/write-xml.c:59
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "無法產生輸出檔 “%s”"
+msgstr "無法產生輸出檔「%s」"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:282
 msgid "standard output"
 msgstr "標準輸出"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:708
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "無法建立 %s 目錄"
+msgstr "無法建立「%s」目錄"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:771
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-csharp.c:768
-#, fuzzy, c-format
+#: src/write-csharp.c:773
+#, c-format
 msgid "compilation of C# class failed"
-msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
+msgstr "編譯 C# 類別失敗"
+
+#: src/write-desktop.c:163 src/write-mo.c:804 src/write-qt.c:741
+#: src/write-tcl.c:218
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "當開啟檔案「%s」來寫入內容時發生錯誤"
 
-#: src/write-java.c:1080
+#: src/write-java.c:1096
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "並非有效的 Java class 名稱：%s"
+msgstr "並非有效的 Java 類別名稱：%s"
 
-#: src/write-java.c:1165
+#: src/write-java.c:1216
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
+msgstr ""
+"編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
 
-#: src/write-java.c:1168
-#, fuzzy, c-format
+#: src/write-java.c:1219
+#, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
+msgstr "編譯 Java 類別失敗，請嘗試設定 $JAVAC 變數"
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
-#, c-format
-msgid "error while opening \"%s\" for writing"
-msgstr "當開啟檔案 %s 來寫入內容時發生錯誤"
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "不完整的多位元組序列"
 
-#: src/write-po.c:803
-#, fuzzy, c-format
-msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "國際化的訊息不應含有 ‘\\%c’ 這個轉義控制序列 (escape sequence)"
+#: src/write-po.c:884
+#, c-format
+msgid ""
+"internationalized messages should not contain the '\\%c' escape sequence"
+msgstr "國際化的訊息不應包含「\\%c」跳脫序列"
 
-#: src/write-po.c:1254 src/write-po.c:1383
-#, fuzzy, c-format
+#: src/write-po.c:1334 src/write-po.c:1502
+#, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
 "This will cause problems to translators who use a character encoding\n"
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"下列的 msgid 含有不屬於 ASCII 的字元。\n"
-"這樣會對任何使用其它編碼 (和您用的字元集編碼不同) 的翻譯者構成問題。\n"
-"請考慮使用只有 ASCII 字元的 msgid。\n"
+"下列 msgctxt 包含非 ASCII 字元。\n"
+"對於與您使用不同字元編碼的翻譯者來說，這些字元可能造成障礙。請考慮使\n"
+"用純 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1346 src/write-po.c:1514
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3015,88 +3578,117 @@ msgid ""
 "%s\n"
 msgstr ""
 "下列的 msgid 含有不屬於 ASCII 的字元。\n"
-"這樣會對任何使用其它編碼 (和您用的字元集編碼不同) 的翻譯者構成問題。\n"
+"這樣會對使用其它編碼方式（和您所使用的字元集編碼不同）的翻譯者構成問題。\n"
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:668
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Qt 的翻譯檔不能處理複數型態\n"
 
-#: src/write-qt.c:693
-#, fuzzy
+#: src/write-qt.c:694
 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 "翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的字句使用 Unicode，未翻譯的字句是不支援的。\n"
+msgstr ""
+"訊息庫中的 msgctxt 字串包含超出 ISO-8859-1 範圍的字元，\n"
+"但 Qt 訊息庫格式僅支援已翻譯字串的 Unicode 支援，而不支援內文字串\n"
 
-#: src/write-qt.c:717
+#: src/write-qt.c:718
 msgid ""
 "message catalog has msgid 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 untranslated strings\n"
-msgstr "翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的字句使用 Unicode，未翻譯的字句是不支援的。\n"
+msgstr ""
+"翻譯檔中某些 msgid 含有 ISO-8859-1 範圍以外的字元，\n"
+"但 Qt 翻譯檔格式的 Unicode 支援只支援翻譯訊息，\n"
+"未翻譯訊息是不支援的。\n"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "將內容寫入至 %s 副行程時發生錯誤"
+msgstr "將內容寫入至 %s 子行程時發生錯誤"
 
-#: src/write-resources.c:131
-#, fuzzy
+#: src/write-resources.c:133
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
-msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
+msgstr ""
+"訊息庫有依賴內文的翻譯\n"
+"但是 C# .resources 格式不支援內文\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:152
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#: src/write-tcl.c:157
-#, fuzzy
+#: src/write-tcl.c:159
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
-msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
+msgstr ""
+"訊息庫有依賴內文的翻譯\n"
+"但是 Tcl 訊息庫不支援內文\n"
 
-#: src/write-tcl.c:176
+#: src/write-tcl.c:178
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
+#: src/x-awk.c:340 src/x-javascript.c:748 src/x-python.c:866
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: 警告：字串未完結"
+msgstr "%s:%d: 警告：字串未結束"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:591
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1073 src/x-vala.c:566
+#, c-format
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: 警告：Unicode 字元無效"
+
+#: src/x-c.c:1344
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid ""
+"%s:%d: warning: a double-quote in the delimiter of a raw string literal is "
+"unsupported"
+msgstr "%s:%d: 警告：字串未結束"
+
+#: src/x-c.c:1432
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: unterminated raw string literal"
+msgstr "%s:%d: 警告：字串未結束"
+
+#: src/x-c.c:1442
+#, fuzzy, c-format
+#| msgid "%s:%d: warning: unterminated string literal"
+msgid "%s:%d: warning: invalid raw string literal syntax"
+msgstr "%s:%d: 警告：字串未結束"
+
+#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:665 src/x-vala.c:808
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: 警告：字元常數未完結"
+msgstr "%s:%d: 警告：字元常數未結束"
 
-#: src/x-c.c:1247 src/x-vala.c:832
+#: src/x-c.c:1654 src/x-vala.c:907
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: 警告：字串未完結"
+msgstr "%s:%d: 警告：字串未結束"
 
-#: src/x-csharp.c:224 src/xgettext.c:2055
-#, fuzzy
+#: src/x-csharp.c:225
 msgid "Please specify the source encoding through --from-code."
-msgstr ""
-"%s%s 出現不屬於 ASCII 字元的字串。\n"
-"請使用 --from-code 選項指定源代碼的文字編碼。\n"
+msgstr "請用 --from-code 指定來源編碼方式"
 
 #: src/x-csharp.c:269
 #, c-format
@@ -3105,7 +3697,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"請使用 --from-code 選項指定原始碼的正確文字編碼。\n"
 
 #: src/x-csharp.c:285
 #, c-format
@@ -3113,8 +3705,8 @@ msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: 出現無效而且十分長的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d: 出現不完整而十分長的位元組序列。\n"
+"請使用 --from-code 選項指定原始碼的正確文字編碼。\n"
 
 #: src/x-csharp.c:297
 #, c-format
@@ -3123,7 +3715,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"請使用 --from-code 選項指定原始碼的正確文字編碼。\n"
 
 #: src/x-csharp.c:306
 #, c-format
@@ -3132,9 +3724,9 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"請使用 --from-code 選項指定原始碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:375
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
@@ -3146,562 +3738,869 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"請使用 --from-code 選項指定原始碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1335
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: 警告：Unicode 字元無效"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1451 src/x-java.c:668
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: 警告：字元常數未完結"
+msgstr "%s:%d: 警告：字元常數未結束"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:1953 src/x-java.c:1153
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
+msgstr "%s:%d: 應該有「}」的地方出現了「)」"
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:1983 src/x-java.c:1183
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
+msgstr "%s:%d: 應該有「)」的地方出現了「}」"
 
-#: src/x-glade.c:561
+#: src/xgettext.c:567
 #, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgstr "「%s」不是個有效的編碼名稱。正使用 ASCII 作為替代方式。\n"
+
+#: src/xgettext.c:637
+#, c-format
+msgid "syntax check '%s' unknown"
+msgstr "語法檢查方式「%s」未知"
+
+#: src/xgettext.c:646
+#, c-format
+msgid "sentence end type '%s' unknown"
+msgstr "句子結尾類型「%s」未知"
+
+#: src/xgettext.c:701
+#, c-format
+msgid "--join-existing cannot be used when output is written to stdout"
+msgstr "當結果被導向至標準輸出時，不能使用 --join-existing 選項"
+
+#: src/xgettext.c:705
+#, c-format
+msgid "xgettext cannot work without keywords to look for"
+msgstr "若無關鍵字，xgettext 將無法運作"
+
+#: src/xgettext.c:839
+#, c-format
+msgid "warning: ITS rule file '%s' does not exist"
+msgstr "警告：ITS 規則檔案「%s」不存在"
+
+#: src/xgettext.c:920
+#, c-format
+msgid ""
+"warning: ITS rule file '%s' does not exist; check your gettext installation"
+msgstr "警告：ITS 規則檔案「%s」不存在；請檢查您的 gettext 安裝是否完整。"
+
+#: src/xgettext.c:938
+#, c-format
+msgid "warning: file '%s' extension '%s' is unknown; will try C"
+msgstr "警告：檔案「%s」的副檔名「%s」未知; 將嘗試 C"
 
-#: src/x-glade.c:686
+#: src/xgettext.c:1027
 #, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
+msgid "Extract translatable strings from given input files.\n"
+msgstr "由指定的輸入檔擷取可翻譯的字串。\n"
+
+#: src/xgettext.c:1050
+#, c-format
+msgid ""
+"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
+"po)\n"
 msgstr ""
+"  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而非 messages.po)\n"
+
+#: src/xgettext.c:1052
+#, c-format
+msgid "  -o, --output=FILE           write output to specified file\n"
+msgstr "  -o, --output=FILE           將輸出內容寫入指定檔案\n"
+
+#: src/xgettext.c:1054
+#, 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:1059
+#, c-format
+msgid "Choice of input file language:\n"
+msgstr "輸入檔的語言選擇：\n"
 
-#: src/x-glade.c:841 src/x-glade.c:848
+#: src/xgettext.c:1061
 #, fuzzy, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr "%s:%d:%d: %s"
+#| msgid ""
+#| "  -L, --language=NAME         recognise the specified language\n"
+#| "                                (C, C++, ObjectiveC, PO, Shell, Python, "
+#| "Lisp,\n"
+#| "                                EmacsLisp, librep, Scheme, Smalltalk, "
+#| "Java,\n"
+#| "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+#| "PHP,\n"
+#| "                                GCC-source, NXStringTable, RST, Glade, "
+#| "Lua,\n"
+#| "                                JavaScript, Vala, Desktop)\n"
+msgid ""
+"  -L, --language=NAME         recognise the specified language\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, RSJ, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"  -L, --language=NAME         識別指定的語言\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1068
+#, c-format
+msgid "  -C, --c++                   shorthand for --language=C++\n"
+msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/x-glade.c:875
+#: src/xgettext.c:1070
 #, c-format
 msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
+"By default the language is guessed depending on the input file name "
+"extension.\n"
+msgstr "預設的語言是由輸入檔的副檔名決定的。\n"
+
+#: src/xgettext.c:1075
+#, c-format
+msgid ""
+"      --from-code=NAME        encoding of input files\n"
+"                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"不支援 “glade” 語言。%s 是需要 expat 軟體的，\n"
-"但這個版本編譯時沒有加入 expat 支援。\n"
+"      --from-code=NAME        輸入檔的編碼方式\n"
+"                                (Python, Tcl, Glade 除外)\n"
 
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: 警告：字串未完結"
+#: src/xgettext.c:1078
+#, c-format
+msgid "By default the input files are assumed to be in ASCII.\n"
+msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
+#: src/xgettext.c:1083
+#, c-format
+msgid "  -j, --join-existing         join messages with existing file\n"
+msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
+
+#: src/xgettext.c:1085
+#, 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:1087
+#, c-format
+msgid ""
+"  -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 ""
+"  -cTAG, --add-comments=TAG   從 TAG 開始放置註解塊\n"
+"                              並在輸出檔案中以關鍵字開啟一行\n"
+"  -c, --add-comments          在輸出檔案中以關鍵字開啟一行，\n"
+"                              並放置所有註解塊\n"
+
+#: src/xgettext.c:1092
+#, c-format
+msgid ""
+"      --check=NAME            perform syntax check on messages\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
+msgstr ""
+"      --check=NAME            對訊息文字做語法檢查\n"
+"                                (ellipsis-unicode (Unicode 省略號)、\n"
+"                                 space-ellipsis (空格加省略號)、\n"
+"                                 quote-unicode (Unicode 引號)、\n"
+"                                 bullet-unicode (Unicode 項目符號))\n"
+
+#: src/xgettext.c:1096
+#, c-format
+msgid ""
+"      --sentence-end=TYPE     type describing the end of sentence\n"
+"                                (single-space, which is the default, \n"
+"                                 or double-space)\n"
+msgstr ""
+"      --sentence-end=TYPE     句子結尾的類型描述\n"
+"                                (single-space (單空格，預設值)、\n"
+"                                 double-space (雙空格))\n"
+
+#: src/xgettext.c:1101
+#, c-format
+msgid "Language specific options:\n"
+msgstr "個別語言特殊選項：\n"
+
+#: src/xgettext.c:1103
+#, c-format
+msgid "  -a, --extract-all           extract all strings\n"
+msgstr "  -a, --extract-all           擷取所有字串\n"
+
+#: src/xgettext.c:1105
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (僅支援 C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1113
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+msgstr ""
+"                                (僅支援 C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
+
+#: src/xgettext.c:1118
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=WORD:ARG:FLAG    關鍵字 WORD 的參數編碼 ARG 中\n"
+"                              字串的額外 flag\n"
+
+#: src/xgettext.c:1121
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (僅支援 C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
+
+#: src/xgettext.c:1126
+#, c-format
+msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
+msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C 三併詞\n"
+
+#: src/xgettext.c:1128
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:1130
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=檔案              讀取指定 <檔案> 並套用其中的 ITS 規則\n"
+
+#: src/xgettext.c:1132
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                （僅支援基於 XML 的語言）\n"
+
+#: src/xgettext.c:1134
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    識別 Qt 格式的字串\n"
+
+#: src/xgettext.c:1136 src/xgettext.c:1140 src/xgettext.c:1144
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (只適用於 C++)\n"
+
+#: src/xgettext.c:1138
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   識別 KDE 4 格式字串\n"
+
+#: src/xgettext.c:1142
+#, c-format
+msgid "      --boost                 recognize Boost format strings\n"
+msgstr "      --boost                 識別 Boost 格式字串\n"
+
+#: src/xgettext.c:1146
+#, c-format
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
+msgstr "      --debug                 顯示較詳細的格式字串識別結果\n"
+
+#: src/xgettext.c:1171
+#, c-format
+msgid "      --properties-output     write out a Java .properties file\n"
+msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
+
+#: src/xgettext.c:1175
+#, c-format
+msgid "      --itstool               write out itstool comments\n"
+msgstr "      --itstool               輸出 itstool 註解\n"
+
+#: src/xgettext.c:1188
+#, c-format
+msgid "      --copyright-holder=STRING  set copyright holder in output\n"
+msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
+
+#: src/xgettext.c:1190
+#, c-format
+msgid ""
+"      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr ""
+"      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
+"專案\n"
+
+#: src/xgettext.c:1192
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PACKAGE  輸出時設定套裝軟體名字\n"
+
+#: src/xgettext.c:1194
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSION  輸出時設定套裝軟體版本\n"
+
+#: src/xgettext.c:1196
+#, 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:1198
+#, c-format
+msgid ""
+"  -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:1201
+#, c-format
+msgid ""
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
+msgstr ""
+"  -M[字串], --msgstr-suffix[=字串]       使用 <字串> 或 \"\" 作為 msgstr 值的"
+"後置詞\n"
+
+#: src/xgettext.c:1597
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr "--flag 指定的參數語法不是 <關鍵字>:<參數編號>:[遍數-]<旗標> 格式：%s"
+
+#: src/xgettext.c:1695
+msgid "standard input"
+msgstr "標準輸入"
+
+#: src/xgettext.c:1872
+msgid ""
+"The option --msgid-bugs-address was not specified.\n"
+"If you are using a 'Makevars' file, please specify\n"
+"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
+"specify an --msgid-bugs-address command line option.\n"
 msgstr ""
-"%s%s 出現不屬於 ASCII 字元的字串。\n"
-"請使用 --from-code 選項指定源代碼的文字編碼。\n"
+"未指定選項 --msgid-bugs-address。\n"
+"如果您正在使用「Makevars」檔案，請指定\n"
+"MSGID_BUGS_ADDRESS 變數；\n"
+"否則，請指定 --msgid-bugs-address 指令列選項。\n"
+
+#: src/xgettext.c:2088
+#, c-format
+msgid "language '%s' unknown"
+msgstr "語言「%s」未知"
+
+#: src/x-javascript.c:231
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "請用 --from-code 指定來源編碼方式\n"
 
 #: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：出現了無效的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼\n"
 
 #: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
-"%s:%d: 出現無效而且十分長的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：十分長的不完整多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼\n"
 
 #: src/x-javascript.c:303
-#, fuzzy, c-format
+#, 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:%d: 檔案末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：檔案結尾處出現了不完整的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼\n"
 
 #: src/x-javascript.c:312
-#, fuzzy, c-format
+#, 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:%d: 該行末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：行結尾處出現了不完整的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼\n"
 
 #: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code\n"
 msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：無效的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼\n"
 
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:919
+#, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: 警告：字串未完結"
+msgstr "%s:%d：警告：正規表示式過早結束"
 
-#: src/x-perl.c:308
+#: src/x-javascript.c:1027
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d：警告：不允許使用 %s"
+
+#: src/x-javascript.c:1041
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d：警告：未閉合的 XML 標記"
+
+#: src/x-perl.c:339
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr "%s:%d: EOF 之前找不到任何表示字串完結的標記 “%s”"
+msgstr "%s:%d: EOF 之前找不到任何表示字串完結的標記「%s」"
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1074
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: \\x{HEXNUMBER} 缺少了右邊的大括號"
+msgstr "%s:%d: \\x{HEXNUMBER} 缺少了右方大括號"
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1195
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\l”) 無效"
+msgstr "%s:%d: 8 位字元「%c」的轉換 (「\\l」) 無效"
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\u”) 無效"
+msgstr "%s:%d: 8 位字元「%c」的轉換 (「\\u」) 無效"
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1249
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr ""
+msgstr "%s:%d：「%c」處有無效的變數轉義字元"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1262
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\L”) 無效"
+msgstr "%s:%d: 8 位字元「%c」的轉換 (「\\L」) 無效"
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1279
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
+msgstr "%s:%d: 8 位字元「%c」的轉換 (「\\U」) 無效"
 
-#: src/x-python.c:278
+#: src/x-python.c:279
+#, fuzzy
+#| msgid ""
+#| "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"
 msgid ""
 "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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
+"請透過 --from-code 或是註解指定來源檔案的編碼，\n"
+"如 http://www.python.org/peps/pep-0263.html 中所規範的那樣。\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:325
 #, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：出現了無效的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的正確編碼，詳見\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:342
 #, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Long incomplete multibyte sequence.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"%s:%d: 出現無效而且十分長的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：十分長的不完整多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的正確編碼，詳見\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of file.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"%s:%d: 檔案末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：檔案結尾處出現了不完整的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的正確編碼，詳見\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:365
 #, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Incomplete multibyte sequence at end of line.\n"
+#| "Please specify the correct source encoding through --from-code or through "
+#| "a\n"
+#| "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code or through a\n"
-"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
+"comment as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"%s:%d: 該行末端出現不完整的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：檔案結尾處出現了不完整的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的正確編碼，詳見\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:398
 #, fuzzy, c-format
+#| msgid ""
+#| "%s:%d: Invalid multibyte sequence.\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"
 msgid ""
 "%s:%d: Invalid multibyte sequence.\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"
+"as specified in https://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
-"%s:%d: 出現無效的位元組序列。\n"
-"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
+"%s:%d：無效的多位元組序列。\n"
+"請透過 --from-code 指定來源檔案的編碼，詳見\n"
+"http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:654
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+msgstr "未知編碼「%s」。先按照 ASCII 處理。"
 
-#: src/x-rst.c:108
+#: src/x-rst.c:116
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: 無效的字串定義"
+msgstr "%s:%d: 字串定義無效"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:180
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 後缺少了數字"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:215
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 無效的字串表示式"
 
-#: src/x-sh.c:1074
-#, c-format
-msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: 警告：$\"...\" 這種格式因為安全理由已經過時；請改用 eval_gettext"
+#: src/x-rst.c:676
+#, fuzzy, c-format
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid JSON syntax"
+msgstr "%s:%d: 字串定義無效"
 
-#: src/x-vala.c:558
+#: src/x-rst.c:683
 #, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: 警告：字串未完結"
+#| msgid "%s:%d: invalid string definition"
+msgid "%s:%d: invalid RSJ syntax"
+msgstr "%s:%d: 字串定義無效"
 
-#: src/xgettext.c:636
+#: src/x-rst.c:691
 #, c-format
-msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
+msgid "%s:%d: invalid RSJ version. Only version 1 is supported."
+msgstr ""
 
-#: src/xgettext.c:641
+#: src/x-sh.c:1101
 #, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr "若無關鍵字，xgettext 將無法運作"
-
-#: src/xgettext.c:785
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "警告：無法辨認檔案 ‘%s’ 的副檔名 ‘%s’；會假設是 C 格式來處理"
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr "%s:%lu: 警告：$\"…\" 語法因安全理由而過時；請改用 eval_gettext"
 
-#: src/xgettext.c:836
+#: src/x-vala.c:616
 #, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d：警告：正規表示式過早結束"
 
-#: src/xgettext.c:859
-#, c-format
-msgid "  -d, --default-domain=NAME   use NAME.po for output (instead of messages.po)\n"
-msgstr "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
+#: libgettextpo/gettext-po.c:84
+msgid "<unnamed>"
+msgstr "<未命名>"
+
+#: libgettextpo/markup.c:366 libgettextpo/markup.c:449
+msgid "invalid UTF-8 sequence"
+msgstr "無效的 UTF-8 序列"
 
-#: src/xgettext.c:861
+#: libgettextpo/markup.c:377
 #, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
+msgid "'%s' is not a valid name: %c"
+msgstr "「%s」不是有效的名稱：%c"
 
-#: src/xgettext.c:863
+#: libgettextpo/markup.c:397
 #, c-format
-msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr "  -p, --output-dir=DIR        輸出檔會存取在指定目錄\n"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "「%s」不是有效的名稱：「%c」"
 
-#: src/xgettext.c:868
+#: libgettextpo/markup.c:523 libgettextpo/markup.c:534
+#: libgettextpo/markup.c:559
 #, c-format
-msgid "Choice of input file language:\n"
-msgstr "輸入檔的語言選擇：\n"
+msgid "invalid character reference: %s"
+msgstr "無效的字元引用：%s"
 
-#: src/xgettext.c:870
-#, fuzzy, c-format
-msgid ""
-"  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala)\n"
-msgstr ""
-"  -L, --language=語言         辨認指定的程式語言\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+#: libgettextpo/markup.c:526
+msgid "not a valid number specification"
+msgstr "並非有效的數字規格"
 
-#: src/xgettext.c:877
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
+#: libgettextpo/markup.c:535 libgettextpo/markup.c:606
+msgid "no ending ';'"
+msgstr "沒有結尾的「;」"
 
-#: src/xgettext.c:879
-#, c-format
-msgid "By default the language is guessed depending on the input file name extension.\n"
-msgstr "預設的語言是由輸入檔的延伸檔名決定的。\n"
+#: libgettextpo/markup.c:560
+msgid "non-permitted character"
+msgstr "不被允許的字元"
 
-#: src/xgettext.c:884
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-"      --from-code=NAME        輸入檔的文字編碼\n"
-"                                (Python, Tcl, Glade 例外)\n"
+#: libgettextpo/markup.c:599
+msgid "empty"
+msgstr "空"
 
-#: src/xgettext.c:887
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
+#: libgettextpo/markup.c:604
+msgid "unknown"
+msgstr "未知"
 
-#: src/xgettext.c:892
+#: libgettextpo/markup.c:608
 #, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
+msgid "invalid entity reference: %s"
+msgstr "無效的實體參考：%s"
 
-#: src/xgettext.c:894
-#, 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"
+#: libgettextpo/markup.c:959
+msgid "document must begin with an element"
+msgstr "檔案必須以一個元素開頭"
 
-#: src/xgettext.c:896
+#: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
+#: libgettextpo/markup.c:1332
 #, c-format
-msgid ""
-"  -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 ""
+msgid "invalid character after '%s'"
+msgstr "「%s」後發現無效字元"
 
-#: src/xgettext.c:902
+#: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
-msgid "Language specific options:\n"
-msgstr "個別語言特殊選項：\n"
+msgid "missing '%c'"
+msgstr "缺少「%c」"
 
-#: src/xgettext.c:904
+#: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all           抽取所有字串\n"
+msgid "missing '%c' or '%c'"
+msgstr "缺少「%c」或「%c」"
 
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (只適用於 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+#: libgettextpo/markup.c:1333
+msgid "a close element name"
+msgstr "閉合元素名稱"
 
-#: src/xgettext.c:911
-#, fuzzy, c-format
-msgid ""
-"  -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"
+#: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
+msgid "element is closed"
+msgstr "元素已閉合"
 
-#: src/xgettext.c:919
-#, c-format
-msgid ""
-"      --flag=WORD:ARG:FLAG    additional flag for strings inside the argument\n"
-"                              number ARG of keyword WORD\n"
-msgstr ""
+#: libgettextpo/markup.c:1475
+msgid "empty document"
+msgstr "空檔案"
 
-#: src/xgettext.c:922
-#, fuzzy, c-format
-msgid ""
-"                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
-"                                Lua, JavaScript, Vala)\n"
-msgstr ""
-"                                (只適用於 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+#: libgettextpo/markup.c:1488
+msgid "after '<'"
+msgstr "在「<」之後"
 
-#: src/xgettext.c:927
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C trigraph\n"
+#: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
+msgid "elements still open"
+msgstr "元素未閉合"
 
-#: src/xgettext.c:929
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
+#: libgettextpo/markup.c:1500
+msgid "missing '>'"
+msgstr "缺少「>」"
 
-#: src/xgettext.c:931
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    辨認 Qt 格式的字串\n"
+#: libgettextpo/markup.c:1504
+msgid "inside an element name"
+msgstr "在元素名稱中"
 
-#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr "                                (只適用於 C++)\n"
+#: libgettextpo/markup.c:1509
+msgid "inside an attribute name"
+msgstr "在屬性名稱中"
 
-#: src/xgettext.c:935
-#, fuzzy, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    辨認 Qt 格式的字串\n"
+#: libgettextpo/markup.c:1513
+msgid "inside an open tag"
+msgstr "在未閉合標籤中"
 
-#: src/xgettext.c:939
-#, fuzzy, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --qt                    辨認 Qt 格式的字串\n"
+#: libgettextpo/markup.c:1517
+msgid "after '='"
+msgstr "在「=」之後"
 
-#: src/xgettext.c:943
-#, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
+#: libgettextpo/markup.c:1522
+msgid "inside an attribute value"
+msgstr "在屬性值中"
 
-#: src/xgettext.c:968
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
+#: libgettextpo/markup.c:1533
+msgid "inside the close tag"
+msgstr "在閉合標籤中"
 
-#: src/xgettext.c:983
-#, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
+#: libgettextpo/markup.c:1537
+msgid "inside a comment or processing instruction"
+msgstr "在註解或處理指令中"
 
-#: src/xgettext.c:985
+#: libgettextpo/markup.c:1548
 #, c-format
-msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的專案\n"
+msgid "document ended unexpectedly: %s"
+msgstr "檔案在非預期的位置結束：%s"
 
-#: src/xgettext.c:987
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s：選項 --%s 不可配合參數使用\n"
 
-#: src/xgettext.c:989
-#, fuzzy, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
+#, c-format
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s：無法辨識「--%s」選項\n"
 
-#: src/xgettext.c:991
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  指定匯報 msgid 問題時的郵件地址\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s：選項「-W %s」不明確\n"
 
-#: src/xgettext.c:993
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n"
-"                                values\n"
-msgstr ""
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s：選項「-W %s」不可配合參數使用\n"
 
-#: src/xgettext.c:996
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n"
-"                                values\n"
-msgstr ""
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s：選項「-W %s」需要參數\n"
 
-#: src/xgettext.c:1817
 #, c-format
-msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
-msgstr ""
+#~ msgid "warning: PO file header fuzzy\n"
+#~ msgstr "警告：PO 檔的標頭仍然為模糊狀態\n"
 
-#: src/xgettext.c:1916
-msgid "standard input"
-msgstr "標準輸入"
+#, c-format
+#~ msgid "warning: older versions of msgfmt will give an error on this\n"
+#~ msgstr "警告：較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
 
-#: src/xgettext.c:2020
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
+#~ msgid "Non-ASCII character at %s%s."
+#~ msgstr "%s%s 處有非 ASCII 字元。"
 
-#: src/xgettext.c:2024
 #, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
+#~ msgid "Non-ASCII comment at or before %s%s."
+#~ msgstr "%s%s 處或之前位置有非 ASCII 註解。"
 
-#: src/xgettext.c:2029
 #, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
+#~ msgid "Non-ASCII string at %s%s."
+#~ msgstr "%s%s 處有非 ASCII 字串。"
 
-#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
-msgid "%s%s: warning: "
-msgstr "%s%s: 警告："
+#~ msgid "%s%s: warning: "
+#~ msgstr "%s%s: 警告："
 
-#: src/xgettext.c:2138
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr ""
+#~ msgid ""
+#~ "Although being used in a format string position, the %s is not a valid %s "
+#~ "format string. Reason: %s\n"
+#~ msgstr ""
+#~ "儘管在格式字串的位置使用，但 %s 仍不是有效的 %s 格式字串。原因：%s\n"
 
-#: src/xgettext.c:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "縱使表面上 %s 宣告了是 %s 格式字串，但實際上不是。原因為：%s\n"
+#~ msgid ""
+#~ "Although declared as such, the %s is not a valid %s format string. "
+#~ "Reason: %s\n"
+#~ msgstr "縱使表面上 %s 宣告了是 %s 格式字串，但實際上不是。原因為：%s\n"
 
-#: src/xgettext.c:2170
 #, c-format
-msgid ""
-"'%s' format string with unnamed arguments cannot be properly localized:\n"
-"The translator cannot reorder the arguments.\n"
-"Please consider using a format string with named arguments,\n"
-"and a mapping instead of a tuple for the arguments.\n"
-msgstr ""
+#~ msgid ""
+#~ "'%s' format string with unnamed arguments cannot be properly localized:\n"
+#~ "The translator cannot reorder the arguments.\n"
+#~ "Please consider using a format string with named arguments,\n"
+#~ "and a mapping instead of a tuple for the arguments.\n"
+#~ msgstr ""
+#~ "帶有未命名參數的「%s」格式字串無法正確本地化：\n"
+#~ "翻譯者無法重新編排參數的順序。\n"
+#~ "請考慮使用帶有命名參數和映射的格式字串，而不是使用參數元組。\n"
 
-#: src/xgettext.c:2232
-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 ""
-"空白的 msgid。它是保留給 GNU gettext 專用的：\n"
-"gettext(\"\") 會回傳檔案開始部份的資訊，\n"
-"並非空白字串。\n"
+#~ 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 ""
+#~ "空白的 msgid。它是保留給 GNU gettext 使用的：\n"
+#~ "gettext(\"\") 會回傳檔案標頭的中繼資訊，\n"
+#~ "而非空白字串。\n"
 
-#: src/xgettext.c:2869
-#, fuzzy, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "%2$s 的引數 %1$s 不明確"
+#, c-format
+#~ msgid "ambiguous argument specification for keyword '%.*s'"
+#~ msgstr "關鍵字「%.*s」的參數規範不明確"
 
-#: src/xgettext.c:2896
 #, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
+#~ msgid "warning: missing context for keyword '%.*s'"
+#~ msgstr "警告：關鍵字「%.*s」缺少內文"
 
-#: src/xgettext.c:2921
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
+#~ msgid "warning: missing context for plural argument of keyword '%.*s'"
+#~ msgstr "警告：關鍵字「%.*s」缺少複數參數內文"
 
-#: src/xgettext.c:2942
 #, c-format
-msgid "context mismatch between singular and plural form"
-msgstr ""
+#~ msgid "context mismatch between singular and plural form"
+#~ msgstr "單數和複數的內文不符"
 
-#: src/xgettext.c:3052
 #, fuzzy
-msgid ""
-"The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\n"
-"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
-"specify an --msgid-bugs-address command line option.\n"
-msgstr ""
-"您未使用 --msgid-bugs-address 選項。\n"
-"如果您使用 ‘Makevars’ 檔案，請在其中設定\n"
-"MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
-"使用 --msgid-bugs-address 選項。\n"
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%d:%d: %s"
 
-#: src/xgettext.c:3267
-#, fuzzy, c-format
-msgid "language '%s' unknown"
-msgstr "不明的語言 ‘%s’"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr "<未命名>"
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "不支援 “glade” 語言。%s 是需要 expat 軟體的，\n"
+#~ "但這個版本編譯時沒有加入 expat 支援。\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s：選項不合法 -- %c\n"
@@ -3714,8 +4613,10 @@ msgstr "<未命名>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "版權所有 (C) %s Free Software Foundation, Inc.\n"
 #~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n"
@@ -3754,7 +4655,8 @@ msgstr "<未命名>"
 #~ msgid "Invalid email address: invalid character."
 #~ msgstr "電子郵件地址無效：字元無效。"
 
-#~ msgid "Invalid email address: need a fully qualified host name or domain name."
+#~ msgid ""
+#~ "Invalid email address: need a fully qualified host name or domain name."
 #~ msgstr "電子郵件地址無效：需要完整的主機名稱和網域名稱。"
 
 #~ msgid "Invalid email address: missing @"